bpo-40479: Fix undefined behavior in Modules/_hashopenssl.c (pythonGH-31153)

miss-islington · ZackerySpytz · hello-adam · commit 2dd2e183db25 · 2022-06-02T16:21:23.000-04:00
va_end() must be called before returning. (cherry picked from commit 59e004a) Co-authored-by: Zackery Spytz <zspytz@gmail.com>
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-02-06-23-08-30.bpo-40479.zED3Zu.rst b/Misc/NEWS.d/next/Core and Builtins/2022-02-06-23-08-30.bpo-40479.zED3Zu.rst
@@ -0,0 +1 @@
+Add a missing call to ``va_end()`` in ``Modules/_hashopenssl.c``.
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
@@ -311,6 +311,7 @@ _setException(PyObject *exc, const char* altmsg, ...)
         } else {
             PyErr_FormatV(exc, altmsg, vargs);
         }
+        va_end(vargs);
         return NULL;
     }
     va_end(vargs);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Add a missing call to ``va_end()`` in ``Modules/_hashopenssl.c``.
Original file line number	Diff line number	Diff line change
`@@ -311,6 +311,7 @@ _setException(PyObject exc, const char altmsg, ...)`
`311`	`311`	`} else {`
`312`	`312`	`PyErr_FormatV(exc, altmsg, vargs);`
`313`	`313`	`}`
	`314`	`+ va_end(vargs);`
`314`	`315`	`return NULL;`
`315`	`316`	`}`
`316`	`317`	`va_end(vargs);`