diff options
| author | Bruno Haible <bruno@clisp.org> | 2006-11-06 20:15:10 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:14:19 +0200 |
| commit | e86f6c583e542d6a1d2d2b5f6bfaa5c155654f0f (patch) | |
| tree | 160564919f1fea7fbfa5d4a5fcd294867012ca6a /gettext-runtime/src | |
| parent | 9484d0c4feb9cc4efe47f69967b406e2b960596b (diff) | |
| download | external_gettext-e86f6c583e542d6a1d2d2b5f6bfaa5c155654f0f.zip external_gettext-e86f6c583e542d6a1d2d2b5f6bfaa5c155654f0f.tar.gz external_gettext-e86f6c583e542d6a1d2d2b5f6bfaa5c155654f0f.tar.bz2 | |
New macros XMALLOC, XNMALLOC.
Diffstat (limited to 'gettext-runtime/src')
| -rw-r--r-- | gettext-runtime/src/ChangeLog | 7 | ||||
| -rw-r--r-- | gettext-runtime/src/envsubst.c | 2 | ||||
| -rw-r--r-- | gettext-runtime/src/gettext.c | 2 | ||||
| -rw-r--r-- | gettext-runtime/src/ngettext.c | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog index bb52aef..426cd95 100644 --- a/gettext-runtime/src/ChangeLog +++ b/gettext-runtime/src/ChangeLog @@ -1,3 +1,10 @@ +2006-11-03 Bruno Haible <bruno@clisp.org> + + Simplify xmalloc expressions. Add overflow check in xmalloc arguments. + * envsubst.c (note_variable): Use XNMALLOC instead of xmalloc. + * gettext.c (expand_escape): Likewise. + * ngettext.c (expand_escape): Likewise. + 2006-10-26 Bruno Haible <bruno@clisp.org> * gettext-0.16 released. diff --git a/gettext-runtime/src/envsubst.c b/gettext-runtime/src/envsubst.c index c851267..65f7309 100644 --- a/gettext-runtime/src/envsubst.c +++ b/gettext-runtime/src/envsubst.c @@ -411,7 +411,7 @@ static string_list_ty variables_set; static void note_variable (const char *var_ptr, size_t var_len) { - char *string = (char *) xmalloc (var_len + 1); + char *string = XNMALLOC (var_len + 1, char); memcpy (string, var_ptr, var_len); string[var_len] = '\0'; diff --git a/gettext-runtime/src/gettext.c b/gettext-runtime/src/gettext.c index bea3f5a..a491658 100644 --- a/gettext-runtime/src/gettext.c +++ b/gettext-runtime/src/gettext.c @@ -301,7 +301,7 @@ expand_escape (const char *str) ++cp; } - retval = (char *) xmalloc (strlen (str)); + retval = XNMALLOC (strlen (str), char); rp = retval + (cp - str); memcpy (retval, str, cp - str); diff --git a/gettext-runtime/src/ngettext.c b/gettext-runtime/src/ngettext.c index be021c9..af5c5f2 100644 --- a/gettext-runtime/src/ngettext.c +++ b/gettext-runtime/src/ngettext.c @@ -267,7 +267,7 @@ expand_escape (const char *str) ++cp; } - retval = (char *) xmalloc (strlen (str)); + retval = XNMALLOC (strlen (str), char); rp = retval + (cp - str); memcpy (retval, str, cp - str); |