Merge changes from CUPS 1.7svn-r10629.

[thirdparty/cups.git] / locale / po2strings.c

diff --git a/locale/po2strings.c b/locale/po2strings.c
index 0b7d1f32fb751f90a9193125e74343456fb0fc82..75335bab026f7d832e112de9918d2b47297b1f9c 100644 (file)
--- a/locale/po2strings.c
+++ b/locale/po2strings.c
@@ -213,10 +213,12 @@ main(int  argc,                           /* I - Number of command-line args */
        * Append to current string...
        */
 
+        size_t ptrlen = strlen(ptr);   /* Length of string */
+
        length = (int)strlen(msgstr ? msgstr : msgid);
 
        if ((temp = realloc(msgstr ? msgstr : msgid,
-                           length + strlen(ptr) + 1)) == NULL)
+                           length + ptrlen + 1)) == NULL)
        {
          free(msgid);
          if (msgstr)
@@ -235,7 +237,7 @@ main(int  argc,                             /* I - Number of command-line args */
 
          msgstr = temp;
 
-         strcpy(msgstr + length, ptr);
+         memcpy(msgstr + length, ptr, ptrlen + 1);
        }
        else
        {
@@ -247,7 +249,7 @@ main(int  argc,                             /* I - Number of command-line args */
 
          msgid = temp;
 
-         strcpy(msgid + length, ptr);
+         memcpy(msgid + length, ptr, ptrlen + 1);
        }
       }
       else if (!strncmp(s, "msgstr", 6) && msgid)