[Numpy-svn] r8388 - trunk/numpy/core/src/multiarray

[numpy-svn at scipy.org]

Author: ptvirtan
Date: 2010-05-05 14:28:02 -0500 (Wed, 05 May 2010)
New Revision: 8388

Modified:
   trunk/numpy/core/src/multiarray/methods.c
Log:
BUG: core: ensure keywords[] list is NULL terminated in array_choose (might be related to #1476)

Modified: trunk/numpy/core/src/multiarray/methods.c
===================================================================
--- trunk/numpy/core/src/multiarray/methods.c	2010-05-05 19:27:46 UTC (rev 8387)
+++ trunk/numpy/core/src/multiarray/methods.c	2010-05-05 19:28:02 UTC (rev 8388)
@@ -984,7 +984,7 @@
 static PyObject *
 array_choose(PyArrayObject *self, PyObject *args, PyObject *kwds)
 {
-    static char *keywords[] = {"out", "mode"};
+    static char *keywords[] = {"out", "mode", NULL};
     PyObject *choices;
     PyArrayObject *out = NULL;
     NPY_CLIPMODE clipmode = NPY_RAISE;