Merge pull request #5168 from jkseppan/fix-5105-again

tacaswell · tacaswell · commit 980706871446 · 2015-10-02T17:15:07.000-04:00
FIX: a bounds check
diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -331,6 +331,9 @@ class array_view_accessors<AV, T, 3>
 
 };
 
+// When adding instantiations of array_view_accessors, remember to add entries
+// to zeros[] below.
+
 }
 
 static npy_intp zeros[] = { 0, 0, 0 };
@@ -470,7 +473,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
 
     npy_intp dim(size_t i) const
     {
-        if (i > ND) {
+        if (i >= ND) {
             return 0;
         }
         return m_shape[i];

Original file line number	Diff line number	Diff line change
`@@ -331,6 +331,9 @@ class array_view_accessors<AV, T, 3>`
`331`	`331`
`332`	`332`	`};`
`333`	`333`
	`334`	`+// When adding instantiations of array_view_accessors, remember to add entries`
	`335`	`+// to zeros[] below.`
	`336`	`+`
`334`	`337`	`}`
`335`	`338`
`336`	`339`	`static npy_intp zeros[] = { 0, 0, 0 };`
`@@ -470,7 +473,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>`
`470`	`473`
`471`	`474`	`npy_intp dim(size_t i) const`
`472`	`475`	`{`
`473`		`- if (i > ND) {`
	`476`	`+ if (i >= ND) {`
`474`	`477`	`return 0;`
`475`	`478`	`}`
`476`	`479`	`return m_shape[i];`