diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-05-18 09:04:57 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-05-18 09:04:57 +0800 |
| commit | 074c0268fd32d6527e124cff386bb6b15cf90017 (patch) | |
| tree | 62111c3c70d46a738f15514e988a707409ca45f4 /src/gtkutil.c | |
| parent | db48eff8cf4a88393c0209f663ca194ee37fa747 (diff) | |
| parent | 5ef169ed701fa4f850fdca5563cdd468207d5d4f (diff) | |
| download | emacs-feature/android.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/androidfeature/android
Diffstat (limited to 'src/gtkutil.c')
| -rw-r--r-- | src/gtkutil.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index 4cc0f9f15b4..22b2a70f279 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -694,8 +694,8 @@ get_utf8_string (const char *str) len = strlen (str); ptrdiff_t alloc; - if (INT_MULTIPLY_WRAPV (nr_bad, 4, &alloc) - || INT_ADD_WRAPV (len + 1, alloc, &alloc) + if (ckd_mul (&alloc, nr_bad, 4) + || ckd_add (&alloc, alloc, len + 1) || SIZE_MAX < alloc) memory_full (SIZE_MAX); up = utf8_str = xmalloc (alloc); |