Merge pull request #623 from ssilverman/issue-591

Fix Print::printf() to call va_end()
PaulStoffregen · Dec 22, 2021 · ca6c78b · ca6c78b
2 parents cbfea6e + 42006d0
commit ca6c78b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/teensy/Print.cpp b/teensy/Print.cpp
@@ -102,7 +102,9 @@ int Print::printf(const char *format, ...)
 	fdev_setup_stream(&f, printf_putchar, NULL, _FDEV_SETUP_WRITE);
 	fdev_set_udata(&f, this);
 	va_start(ap, format);
-	return vfprintf(&f, format, ap);
+	int retval = vfprintf(&f, format, ap);
+	va_end(ap);
+	return retval;
 }
 
 int Print::printf(const __FlashStringHelper *format, ...)
@@ -113,7 +115,9 @@ int Print::printf(const __FlashStringHelper *format, ...)
 	fdev_setup_stream(&f, printf_putchar, NULL, _FDEV_SETUP_WRITE);
 	fdev_set_udata(&f, this);
 	va_start(ap, format);
-	return vfprintf_P(&f, (const char *)format, ap);
+	int retval = vfprintf_P(&f, (const char *)format, ap);
+	va_end(ap);
+	return retval;
 }
 
 

diff --git a/teensy3/Print.cpp b/teensy3/Print.cpp
@@ -96,9 +96,12 @@ int Print::printf(const char *format, ...)
 	va_list ap;
 	va_start(ap, format);
 #ifdef __STRICT_ANSI__
+	va_end(ap);
 	return 0;  // TODO: make this work with -std=c++0x
 #else
-	return vdprintf((int)this, format, ap);
+	int retval = vdprintf((int)this, format, ap);
+	va_end(ap);
+	return retval;
 #endif
 }
 
@@ -107,9 +110,12 @@ int Print::printf(const __FlashStringHelper *format, ...)
 	va_list ap;
 	va_start(ap, format);
 #ifdef __STRICT_ANSI__
+	va_end(ap);
 	return 0;
 #else
-	return vdprintf((int)this, (const char *)format, ap);
+	int retval = vdprintf((int)this, (const char *)format, ap);
+	va_end(ap);
+	return retval;
 #endif
 }
 

diff --git a/teensy4/Print.cpp b/teensy4/Print.cpp
@@ -102,9 +102,12 @@ int Print::printf(const char *format, ...)
 	va_list ap;
 	va_start(ap, format);
 #ifdef __STRICT_ANSI__
+	va_end(ap);
 	return 0;  // TODO: make this work with -std=c++0x
 #else
-	return vdprintf((int)this, format, ap);
+	int retval = vdprintf((int)this, format, ap);
+	va_end(ap);
+	return retval;
 #endif
 }
 
@@ -113,9 +116,12 @@ int Print::printf(const __FlashStringHelper *format, ...)
 	va_list ap;
 	va_start(ap, format);
 #ifdef __STRICT_ANSI__
+	va_end(ap);
 	return 0;
 #else
-	return vdprintf((int)this, (const char *)format, ap);
+	int retval = vdprintf((int)this, (const char *)format, ap);
+	va_end(ap);
+	return retval;
 #endif
 }