From: Gregory P. Smith <greg@krypto.org>
Date: Wed, 18 Jan 2017 00:54:56 +0000 (-0800)
Subject: Address a minor Coverity warning re: unchecked PyArg_ParseTuple calls
X-Git-Tag: v3.7.0a1~1526
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8128d5a491fdacd40b4cc0dcf54ef8c61f264fb8;p=python

Address a minor Coverity warning re: unchecked PyArg_ParseTuple calls
in socket.sendto().  A PyErr_Occurred() check was happening later, but
it is better to just use the return value and not call PyErr_Occurred().
---

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index d5506a6336..274769d6b0 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -3863,11 +3863,15 @@ sock_sendto(PySocketSockObject *s, PyObject *args)
     arglen = PyTuple_Size(args);
     switch (arglen) {
         case 2:
-            PyArg_ParseTuple(args, "y*O:sendto", &pbuf, &addro);
+            if (!PyArg_ParseTuple(args, "y*O:sendto", &pbuf, &addro)) {
+                return NULL;
+            }
             break;
         case 3:
-            PyArg_ParseTuple(args, "y*iO:sendto",
-                             &pbuf, &flags, &addro);
+            if (!PyArg_ParseTuple(args, "y*iO:sendto",
+                                  &pbuf, &flags, &addro)) {
+                return NULL;
+            }
             break;
         default:
             PyErr_Format(PyExc_TypeError,
@@ -3875,8 +3879,6 @@ sock_sendto(PySocketSockObject *s, PyObject *args)
                          arglen);
             return NULL;
     }
-    if (PyErr_Occurred())
-        return NULL;
 
     if (!IS_SELECTABLE(s)) {
         PyBuffer_Release(&pbuf);