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);