From 15606111d46d61343ca201bb03bdd8223e973142 Mon Sep 17 00:00:00 2001
From: William Westrick <wjw27@cornell.edu>
Date: Sat, 11 Mar 2023 07:26:06 -0800
Subject: [PATCH 1/3] test: add PyBuffer test for strides

---
 src/embed_tests/TestPyBuffer.cs | 36 +++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/embed_tests/TestPyBuffer.cs b/src/embed_tests/TestPyBuffer.cs
index a1bcc161d..1b4e28d12 100644
--- a/src/embed_tests/TestPyBuffer.cs
+++ b/src/embed_tests/TestPyBuffer.cs
@@ -110,6 +110,26 @@ public void Finalization()
             Assert.AreEqual(1, arr.Refcount);
         }
 
+        [Test]
+        public void MultidimensionalNumPyArray()
+        {
+            var ndarray = np.arange(24).reshape(1,2,3,4).T;
+            PyObject ndim = ndarray.ndim;
+            PyObject shape = ndarray.shape;
+            PyObject strides = ndarray.strides;
+            PyObject contiguous = ndarray.flags["C_CONTIGUOUS"];
+
+            using PyBuffer buf = ndarray.GetBuffer(PyBUF.STRIDED);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(buf.Dimensions, Is.EqualTo(ndim.As<int>()));
+                Assert.That(buf.Shape, Is.EqualTo(shape.As<long[]>()));
+                Assert.That(buf.Strides, Is.EqualTo(strides.As<long[]>()));
+                Assert.That(buf.IsContiguous(BufferOrderStyle.C), Is.EqualTo(contiguous.As<bool>()));
+            });
+        }
+
         [MethodImpl(MethodImplOptions.NoInlining)]
         static void MakeBufAndLeak(PyObject bufProvider)
         {
@@ -121,5 +141,21 @@ static PyObject ByteArrayFromAsciiString(string str)
             using var scope = Py.CreateScope();
             return Runtime.Runtime.PyByteArray_FromStringAndSize(str).MoveToPyObject();
         }
+
+        dynamic np
+        {
+            get
+            {
+                try
+                {
+                    return Py.Import("numpy");
+                }
+                catch (PythonException)
+                {
+                    Assert.Inconclusive("Numpy or dependency not installed");
+                    return null;
+                }
+            }
+        }
     }
 }

From 796f3632ace016671a2856ed2352027cf2f12bba Mon Sep 17 00:00:00 2001
From: legomanww <legomanww@users.noreply.github.com>
Date: Fri, 10 Mar 2023 19:47:45 -0800
Subject: [PATCH 2/3] fix: incorrect length for buffer copy

---
 src/runtime/PythonTypes/PyBuffer.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/runtime/PythonTypes/PyBuffer.cs b/src/runtime/PythonTypes/PyBuffer.cs
index de0e7122f..120582494 100644
--- a/src/runtime/PythonTypes/PyBuffer.cs
+++ b/src/runtime/PythonTypes/PyBuffer.cs
@@ -11,7 +11,7 @@ public sealed class PyBuffer : IDisposable
         private PyObject _exporter;
         private Py_buffer _view;
 
-        unsafe internal PyBuffer(PyObject exporter, PyBUF flags)
+        internal PyBuffer(PyObject exporter, PyBUF flags)
         {
             _view = new Py_buffer();
 
@@ -25,17 +25,17 @@ unsafe internal PyBuffer(PyObject exporter, PyBUF flags)
             var intPtrBuf = new IntPtr[_view.ndim];
             if (_view.shape != IntPtr.Zero)
             {
-                Marshal.Copy(_view.shape, intPtrBuf, 0, (int)_view.len * sizeof(IntPtr));
+                Marshal.Copy(_view.shape, intPtrBuf, 0, _view.ndim);
                 Shape = intPtrBuf.Select(x => (long)x).ToArray();
             }
 
             if (_view.strides != IntPtr.Zero) {
-                Marshal.Copy(_view.strides, intPtrBuf, 0, (int)_view.len * sizeof(IntPtr));
+                Marshal.Copy(_view.strides, intPtrBuf, 0, _view.ndim);
                 Strides = intPtrBuf.Select(x => (long)x).ToArray();
             }
 
             if (_view.suboffsets != IntPtr.Zero) {
-                Marshal.Copy(_view.suboffsets, intPtrBuf, 0, (int)_view.len * sizeof(IntPtr));
+                Marshal.Copy(_view.suboffsets, intPtrBuf, 0, _view.ndim);
                 SubOffsets = intPtrBuf.Select(x => (long)x).ToArray();
             }
         }

From 856b5f8b03a37fc38f4b06881cbb9e249a4b1f70 Mon Sep 17 00:00:00 2001
From: William Westrick <wjw27@cornell.edu>
Date: Sat, 11 Mar 2023 07:40:03 -0800
Subject: [PATCH 3/3] docs: update `CHANGELOG` and `AUTHORS`

---
 AUTHORS.md   | 1 +
 CHANGELOG.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 92f1a4a97..577e898aa 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -85,3 +85,4 @@
 -   ([@alxnull](https://github.com/alxnull))
 -   ([@gpetrou](https://github.com/gpetrou))
 -   Ehsan Iran-Nejad ([@eirannejad](https://github.com/eirannejad))
+-   ([@legomanww](https://github.com/legomanww))
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 818d90c52..b5a46ce04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Make a second call to `pythonnet.load` a no-op, as it was intended.
 
 - Added support for multiple inheritance when inheriting from a class and/or multiple interfaces.
+- Fixed error occuring when calling `GetBuffer` for anything other than `PyBUF.SIMPLE` 
 
 ## [3.0.1](https://github.com/pythonnet/pythonnet/releases/tag/v3.0.1) - 2022-11-03
 

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/pythonnet/pythonnet/pull/2120.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/pythonnet/pythonnet/pull/2120.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/pythonnet/pythonnet/pull/2120.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/pythonnet/pythonnet/pull/2120.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>