Merge pull request #50 from xaizek/fix-null-char-in-printf

Fix line truncation on printing null character via *printf() functions
ku1ik · Jul 20, 2017 · 399e3b1 · 399e3b1
2 parents cb9c3fd + b25866e
commit 399e3b1
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/stderred.c b/src/stderred.c
@@ -177,8 +177,9 @@ int FUNC(fputs_unlocked)(const char *str, FILE *stream) {
 int FUNC(vfprintf)(FILE *stream, const char *format, va_list ap) {
   char *buf = NULL;
 
-  if (vasprintf(&buf, format, ap) > 0) {
-    int result = FUNC(fwrite)(buf, sizeof(char), strlen(buf)/sizeof(char), stream);
+  int nprinted = vasprintf(&buf, format, ap);
+  if (nprinted > 0) {
+    int result = FUNC(fwrite)(buf, sizeof(char), nprinted, stream);
     free(buf);
     return result;
   } else {
@@ -210,8 +211,9 @@ int FUNC(fprintf_unlocked)(FILE *stream, const char *format, ...) {
   char *buf = NULL;
   int result = -1;
 
-  if ( vasprintf(&buf, format, args) > 0) {
-    result = FUNC(fwrite_unlocked)(buf, sizeof(char), strlen(buf)/sizeof(char), stream);
+  int nprinted = vasprintf(&buf, format, args);
+  if (nprinted > 0) {
+    result = FUNC(fwrite_unlocked)(buf, sizeof(char), nprinted, stream);
     free(buf);
   }