From 942302371c1e46fdf486a5be0e036f7232a2fba1 Mon Sep 17 00:00:00 2001
From: Raymond Hettinger <python@rcn.com>
Date: Sat, 26 Mar 2016 03:02:48 -0700
Subject: [PATCH] Minor code cleanup for PyArg_UnpackTuple.

---
 Python/getargs.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Python/getargs.c b/Python/getargs.c
index 66a0c0049b6..05ec27bfbb1 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1771,16 +1771,9 @@ PyArg_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t m
     PyObject **o;
     va_list vargs;
 
-#ifdef HAVE_STDARG_PROTOTYPES
-    va_start(vargs, max);
-#else
-    va_start(vargs);
-#endif
-
     assert(min >= 0);
     assert(min <= max);
     if (!PyTuple_Check(args)) {
-        va_end(vargs);
         PyErr_SetString(PyExc_SystemError,
             "PyArg_UnpackTuple() argument list is not a tuple");
         return 0;
@@ -1798,9 +1791,10 @@ PyArg_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t m
                 "unpacked tuple should have %s%zd elements,"
                 " but has %zd",
                 (min == max ? "" : "at least "), min, l);
-        va_end(vargs);
         return 0;
     }
+    if (l == 0)
+        return 1;
     if (l > max) {
         if (name != NULL)
             PyErr_Format(
@@ -1813,9 +1807,14 @@ PyArg_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t m
                 "unpacked tuple should have %s%zd elements,"
                 " but has %zd",
                 (min == max ? "" : "at most "), max, l);
-        va_end(vargs);
         return 0;
     }
+
+#ifdef HAVE_STDARG_PROTOTYPES
+    va_start(vargs, max);
+#else
+    va_start(vargs);
+#endif
     for (i = 0; i < l; i++) {
         o = va_arg(vargs, PyObject **);
         *o = PyTuple_GET_ITEM(args, i);