Fix: leaking handle in getbuffer wrapper

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/HPyExternalFunctionNodes.java

@@ -70,7 +70,7 @@
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodes.HPyGetNativeSpacePointerNode;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodes.PCallHPyFunction;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.HPyAllAsHandleNodeGen;
-import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.HPyAsPythonObjectNodeGen;
+import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.HPyEnsureHandleNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.HPyGetBufferProcToSulongNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.HPyGetNativeSpacePointerNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.HPyGetSetGetterToSulongNodeGen;
@@ -1588,12 +1588,14 @@ static final class HPyGetBufferRootNode extends HPyMethodDescriptorRootNode {
         @Child private InteropLibrary valueLib;
         @Child private PCallCapiFunction callGetByteArrayTypeId;
         @Child private PCallCapiFunction callFromTyped;
-        @Child private HPyAsPythonObjectNode asPythonObjectNode;
+        @Child private HPyEnsureHandleNode asPythonObjectNode;
         @Child private FromCharPointerNode fromCharPointerNode;
         @Child private CastToJavaStringNode castToJavaStringNode;
         @Child private GetIntArrayNode getIntArrayNode;
         @Child private PRaiseNode raiseNode;
 
+        @CompilationFinal private ConditionProfile isAllocatedProfile;
+
         @TruffleBoundary
         public HPyGetBufferRootNode(PythonLanguage language, String name) {
             super(language, name, HPyCheckPrimitiveResultNodeGen.create(), HPyGetBufferProcToSulongNodeGen.create());
@@ -1655,7 +1657,7 @@ private CExtPyBuffer createPyBuffer(GraalHPyContext hpyContext, Object bufferPtr
             }
             if (asPythonObjectNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                asPythonObjectNode = insert(HPyAsPythonObjectNodeGen.create());
+                asPythonObjectNode = insert(HPyEnsureHandleNodeGen.create());
             }
             if (fromCharPointerNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -1687,7 +1689,11 @@ private CExtPyBuffer createPyBuffer(GraalHPyContext hpyContext, Object bufferPtr
                 ownerObj = ptrLib.readMember(ownerObj, GraalHPyHandle.I);
                 Object owner = null;
                 if (!valueLib.isNull(ownerObj)) {
-                    owner = asPythonObjectNode.execute(hpyContext, ownerObj);
+                    GraalHPyHandle ownerHandle = asPythonObjectNode.execute(hpyContext, ownerObj);
+                    // Since we are now the owner of the handle and no one else will ever use it, we
+                    // need to close it.
+                    ownerHandle.close(hpyContext, ensureIsAllocatedProfile());
+                    owner = ownerHandle.getDelegate();
                 }
 
                 int ndim = castToInt(ptrLib.readMember(bufferPtr, "ndim"));
@@ -1727,6 +1733,14 @@ private CExtPyBuffer createPyBuffer(GraalHPyContext hpyContext, Object bufferPtr
             }
         }
 
+        private ConditionProfile ensureIsAllocatedProfile() {
+            if (isAllocatedProfile == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                isAllocatedProfile = ConditionProfile.create();
+            }
+            return isAllocatedProfile;
+        }
+
         private int castToInt(Object value) {
             if (valueLib.fitsInInt(value)) {
                 try {