Commits

Armin Rigo committed 65a6065

Fix the convertion logic.

Comments (0)

Files changed (1)

pypy/module/_cffi_backend/ctypeptr.py

         if not isinstance(ob, cdataobj.W_CData):
             raise self._convert_error("compatible pointer", w_ob)
         other = ob.ctype
-        if (isinstance(other, W_CTypePtrOrArray) and
-             (self is other or
-              self.can_cast_anything or other.can_cast_anything)):
-            pass    # compatible types
-        else:
-            raise self._convert_error("compatible pointer", w_ob)
+        if not isinstance(other, W_CTypePtrBase):
+            from pypy.module._cffi_backend import ctypearray
+            if isinstance(other, ctypearray.W_CTypeArray):
+                other = other.ctptr
+            else:
+                raise self._convert_error("compatible pointer", w_ob)
+        if self is not other:
+            if not (self.can_cast_anything or other.can_cast_anything):
+                raise self._convert_error("compatible pointer", w_ob)
 
         rffi.cast(rffi.CCHARPP, cdata)[0] = ob._cdata
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.