Merge remote-tracking branch 'upstream/master'

Author: boothj5

src/snprintf.c

@@ -705,7 +705,7 @@ static int dopr_outch (char *buffer, size_t *currlen, size_t maxlen, char c)
 
 int xmpp_vsnprintf (char *str, size_t count, const char *fmt, va_list args)
 {
-  if (str != NULL)
+  if (str != NULL && count > 0)
     str[0] = 0;
   return dopr(str, count, fmt, args);
 }

src/stanza.c

@@ -281,13 +281,13 @@ static char *_escape_xml(xmpp_ctx_t * const ctx, char *text)
 }
 
 /* small helper function */
-static inline void _render_update(int *written, const int length,
+static void _render_update(int *written, const int length,
 			   const int lastwrite,
 			   size_t *left, char **ptr)
 {
     *written += lastwrite;
 
-    if (*written > length) {
+    if (*written >= length) {
 	*left = 0;
 	*ptr = NULL;
     } else {