From: Thomas Heller <theller@ctypes.org>
Date: Thu, 30 Aug 2007 17:15:14 +0000 (+0000)
Subject: Forbid an empty argument list in execv call.
X-Git-Tag: v3.0a1~80
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6790d606ffb44b24129552fca5418c0d408aac05;p=thirdparty%2FPython%2Fcpython.git

Forbid an empty argument list in execv call.

Fixes issue 1039.
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index a5f5de3698c4..085e6fabb877 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -441,6 +441,9 @@ class ExecTests(unittest.TestCase):
     def test_execvpe_with_bad_program(self):
         self.assertRaises(OSError, os.execvpe, 'no such app-', [], None)
 
+    def test_execvpe_with_bad_arglist(self):
+        self.assertRaises(ValueError, os.execvpe, 'notepad', [], None)
+
 class Win32ErrorTests(unittest.TestCase):
     def test_rename(self):
         self.assertRaises(WindowsError, os.rename, test_support.TESTFN, test_support.TESTFN+".bak")
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 4e6e0c595db2..5f8cde601081 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -2834,6 +2834,11 @@ posix_execv(PyObject *self, PyObject *args)
                 PyMem_Free(path);
 		return NULL;
 	}
+	if (argc < 1) {
+		PyErr_SetString(PyExc_ValueError, "execv() arg 2 must not be empty");
+                PyMem_Free(path);
+		return NULL;
+	}
 
 	argvlist = PyMem_NEW(char *, argc+1);
 	if (argvlist == NULL) {