[pypy-commit] cffi default: merge default

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r676:8d5a756901ed
Date: 2012-07-22 17:47 +0200
http://bitbucket.org/cffi/cffi/changeset/8d5a756901ed/

Log:	merge default

diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c
--- a/c/_cffi_backend.c
+++ b/c/_cffi_backend.c
@@ -812,9 +812,11 @@
         char *ptrdata;
         CTypeDescrObject *ctinit;
 
+        if (!CData_Check(init)) {
+            expected = "cdata pointer";
+            goto cannot_convert;
+        }
         expected = "compatible pointer";
-        if (!CData_Check(init))
-            goto cannot_convert;
         ctinit = ((CDataObject *)init)->c_type;
         if (!(ctinit->ct_flags & (CT_POINTER|CT_FUNCTIONPTR))) {
             if (ctinit->ct_flags & CT_ARRAY)