--- include/xmlrpc-c/string_int.h.orig 2016-08-01 22:12:28 UTC

+++ include/xmlrpc-c/string_int.h

@@ -121,8 +121,8 @@ xmlrpc_makePrintableChar(char const inpu

 	(strncpy((A), (B), sizeof(A)), *((A)+sizeof(A)-1) = '\0')

 #define STRSCMP(A,B) \

 	(strncmp((A), (B), sizeof(A)))

-#define STRSCAT(A,B) \

-    (strncat((A), (B), sizeof(A)-strlen(A)), *((A)+sizeof(A)-1) = '\0')

+#define STRNSCAT(A,B) \

+    (strncat((A), (B), sizeof(A)-strlen(A)-1), *((A)+sizeof(A)-1) = '\0')

 /* We could do this, but it works only in GNU C 

 #define SSPRINTF(TARGET, REST...) \

--- src/xmlrpc_datetime.c.orig	2016-08-01 22:11:50 UTC

+++ src/xmlrpc_datetime.c

@@ -161,7 +161,7 @@ xmlrpc_read_datetime_str(xmlrpc_env *   

                 assert(usecs < 1000000);

                 XMLRPC_SNPRINTF(usecString, sizeof(usecString),

                                 ".%06u", usecs);

-                STRSCAT(dtString, usecString);

+                STRNSCAT(dtString, usecString);

             }

             *stringValueP = strdup(dtString);

--- src/xmlrpc_serialize.c.orig	2016-08-01 22:11:23 UTC

+++ src/xmlrpc_serialize.c

@@ -305,7 +305,8 @@ serializeDatetime(xmlrpc_env *       con

             assert(valueP->_value.dt.u < 1000000);

             XMLRPC_SNPRINTF(usecString, sizeof(usecString), ".%06u",

                             valueP->_value.dt.u);

-            STRSCAT(dtString, usecString);

+            STRNSCAT(dtString, usecString);

+

         }

         addString(envP, outputP, dtString);