gh-120155: Fix copy/paste error in HAVE_SUBOFFSETS_IN_LAST_DIM() (#120228)

vstinner · web-flow · commit 90b754052604 · 2024-06-07T17:58:21.000+02:00
Don't hardcode 'dest' in HAVE_SUBOFFSETS_IN_LAST_DIM() macro of
memoryobject.c, but use its 'view' parameter instead.

Fix the Coverity issue:

Error: COPY_PASTE_ERROR (CWE-398):
Python-3.12.2/Objects/memoryobject.c:273:14: original: ""dest-&gt;suboffsets + (dest-&gt;ndim - 1)"" looks like the original copy.
Python-3.12.2/Objects/memoryobject.c:274:14: copy_paste_error: ""dest"" in ""src-&gt;suboffsets + (dest-&gt;ndim - 1)"" looks like a copy-paste error.
Python-3.12.2/Objects/memoryobject.c:274:14: remediation: Should it say ""src"" instead?
#  272|       assert(dest-&gt;ndim &gt; 0 &amp;&amp; src-&gt;ndim &gt; 0);
#  273|       return (!HAVE_SUBOFFSETS_IN_LAST_DIM(dest) &amp;&amp;
#  274|-&gt;             !HAVE_SUBOFFSETS_IN_LAST_DIM(src) &amp;&amp;
#  275|               dest-&gt;strides[dest-&gt;ndim-1] == dest-&gt;itemsize &amp;&amp;
#  276|               src-&gt;strides[src-&gt;ndim-1] == src-&gt;itemsize);
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
@@ -268,7 +268,7 @@ PyTypeObject _PyManagedBuffer_Type = {
 /* Assumptions: ndim >= 1. The macro tests for a corner case that should
    perhaps be explicitly forbidden in the PEP. */
 #define HAVE_SUBOFFSETS_IN_LAST_DIM(view) \
-    (view->suboffsets && view->suboffsets[dest->ndim-1] >= 0)
+    (view->suboffsets && view->suboffsets[view->ndim-1] >= 0)
 
 static inline int
 last_dim_is_contiguous(const Py_buffer *dest, const Py_buffer *src)
