开源软件构建与测试

_service:tar_scm:python-cffi.spec Changed

_service Changed

_service:tar_scm:cffi-1.15.0.tar.gz/PKG-INFO -> _service:tar_scm:cffi-1.15.1.tar.gz/PKG-INFO Changed

_service:tar_scm:cffi-1.15.0.tar.gz/c/_cffi_backend.c -> _service:tar_scm:cffi-1.15.1.tar.gz/c/_cffi_backend.c Changed

@@ -2,7 +2,7 @@
 #include <Python.h>
 #include "structmember.h"
 
-#define CFFI_VERSION  "1.15.0"
+#define CFFI_VERSION  "1.15.1"
 
 #ifdef MS_WIN32
 #include <windows.h>
@@ -2197,7 +2197,7 @@
     }
 }
 
-static PyObject *cdataowning_repr(CDataObject *cd)
+static Py_ssize_t cdataowning_size_bytes(CDataObject *cd)
 {
     Py_ssize_t size = _cdata_var_byte_size(cd);
     if (size < 0) {
@@ -2208,6 +2208,12 @@
         else
             size = cd->c_type->ct_size;
     }
+    return size;
+}
+
+static PyObject *cdataowning_repr(CDataObject *cd)
+{
+    Py_ssize_t size = cdataowning_size_bytes(cd);
     return PyText_FromFormat("<cdata '%s' owning %zd bytes>",
                              cd->c_type->ct_name, size);
 }
@@ -4603,7 +4609,7 @@
            array      ctype, length
            funcptr    ctresult, ellipsis+abi, num_args, ctargs...
     */
-    PyObject *key, *y;
+    PyObject *key, *y, *res;
     void *pkey;
 
     key = PyBytes_FromStringAndSize(NULL, keylength * sizeof(void *));
@@ -4635,8 +4641,9 @@
     /* the 'value' in unique_cache doesn't count as 1, but don't use
        Py_DECREF(x) here because it will confuse debug builds into thinking
        there was an extra DECREF in total. */
-    ((PyObject *)x)->ob_refcnt--;
-    return (PyObject *)x;
+    res = (PyObject *)x;
+    Py_SET_REFCNT(res, Py_REFCNT(res) - 1);
+    return res;
 
  error:
     Py_DECREF(x);
@@ -5665,7 +5672,8 @@
     }
 }
 
-#define ALIGN_ARG(n)  ((n) + 7) & ~7
+#define ALIGN_TO(n, a)  ((n) + ((a)-1)) & ~((a)-1)
+#define ALIGN_ARG(n)    ALIGN_TO(n, 8)
 
 static int fb_build(struct funcbuilder_s *fb, PyObject *fargs,
                     CTypeDescrObject *fresult)
@@ -5690,10 +5698,12 @@
         /* exchange data size */
         /* first, enough room for an array of 'nargs' pointers */
         exchange_offset = nargs * sizeof(void*);
+        /* then enough room for the result --- which means at least
+           sizeof(ffi_arg), according to the ffi docs, but we also
+           align according to the result type, for issue #531 */
+        exchange_offset = ALIGN_TO(exchange_offset, fb->rtype->alignment);
         exchange_offset = ALIGN_ARG(exchange_offset);
         cif_descr->exchange_offset_arg0 = exchange_offset;
-        /* then enough room for the result --- which means at least
-           sizeof(ffi_arg), according to the ffi docs */
         i = fb->rtype->size;
         if (i < (Py_ssize_t)sizeof(ffi_arg))
             i = sizeof(ffi_arg);
@@ -5721,6 +5731,7 @@
         if (fb->atypes != NULL) {
             fb->atypesi = atype;
             /* exchange data size */
+            exchange_offset = ALIGN_TO(exchange_offset, atype->alignment);
             exchange_offset = ALIGN_ARG(exchange_offset);
             cif_descr->exchange_offset_arg1 + i = exchange_offset;
             exchange_offset += atype->size;
@@ -5737,6 +5748,7 @@
 }
 
 #undef ALIGN_ARG
+#undef ALIGN_TO
 
 static void fb_cat_name(struct funcbuilder_s *fb, const char *piece,
                         int piecelen)
@@ -7010,12 +7022,14 @@
     /* this is the constructor of the type implemented in minibuffer.h */
     CDataObject *cd;
     Py_ssize_t size = -1;
+    int explicit_size;
     static char *keywords = {"cdata", "size", NULL};
 
     if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!|n:buffer", keywords,
                                      &CData_Type, &cd, &size))
         return NULL;
 
+    explicit_size = size >= 0;
     if (size < 0)
         size = _cdata_var_byte_size(cd);
 
@@ -7039,6 +7053,20 @@
                      cd->c_type->ct_name);
         return NULL;
     }
+
+    if (explicit_size && CDataOwn_Check(cd)) {
+        Py_ssize_t size_max = cdataowning_size_bytes(cd);
+        if (size > size_max) {
+            char msg256;
+            sprintf(msg, "ffi.buffer(cdata, bytes): creating a buffer of %llu "
+                         "bytes over a cdata that owns only %llu bytes.  This "
+                         "will crash if you access the extra memory",
+                         (unsigned PY_LONG_LONG)size,
+                         (unsigned PY_LONG_LONG)size_max);
+            if (PyErr_WarnEx(PyExc_UserWarning, msg, 1))
+                return NULL;
+        }
+    }
     /*WRITE(cd->c_data, size)*/
     return minibuffer_new(cd->c_data, size, (PyObject *)cd);
 }

_service:tar_scm:cffi-1.15.0.tar.gz/c/libffi_arm64/ffi.lib -> _service:tar_scm:cffi-1.15.1.tar.gz/c/libffi_arm64/ffi.lib Changed

_service:tar_scm:cffi-1.15.0.tar.gz/c/libffi_arm64/include/ffi.h -> _service:tar_scm:cffi-1.15.1.tar.gz/c/libffi_arm64/include/ffi.h Changed

@@ -1,6 +1,7 @@
 /* -----------------------------------------------------------------*-C-*-
-   libffi 3.3-rc0 - Copyright (c) 2011, 2014 Anthony Green
-                    - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
+   libffi 3.4.2
+     - Copyright (c) 2011, 2014, 2019, 2021 Anthony Green
+     - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
 
    Permission is hereby granted, free of charge, to any person
    obtaining a copy of this software and associated documentation
@@ -217,7 +218,8 @@
 typedef enum {
   FFI_OK = 0,
   FFI_BAD_TYPEDEF,
-  FFI_BAD_ABI
+  FFI_BAD_ABI,
+  FFI_BAD_ARGTYPE
 } ffi_status;
 
 typedef struct {
@@ -269,7 +271,7 @@
 #endif
 
 
-FFI_API 
+FFI_API
 void ffi_raw_call (ffi_cif *cif,
 		   void (*fn)(void),
 		   void *rvalue,
@@ -288,15 +290,15 @@
 void ffi_java_raw_call (ffi_cif *cif,
 			void (*fn)(void),
 			void *rvalue,
-			ffi_java_raw *avalue);
+			ffi_java_raw *avalue) __attribute__((deprecated));
 #endif
 
 FFI_API
-void ffi_java_ptrarray_to_raw (ffi_cif *cif, void **args, ffi_java_raw *raw);
+void ffi_java_ptrarray_to_raw (ffi_cif *cif, void **args, ffi_java_raw *raw) __attribute__((deprecated));
 FFI_API
-void ffi_java_raw_to_ptrarray (ffi_cif *cif, ffi_java_raw *raw, void **args);
+void ffi_java_raw_to_ptrarray (ffi_cif *cif, ffi_java_raw *raw, void **args) __attribute__((deprecated));
 FFI_API
-size_t ffi_java_raw_size (ffi_cif *cif);
+size_t ffi_java_raw_size (ffi_cif *cif) __attribute__((deprecated));
 
 /* ---- Definitions for closures ----------------------------------------- */
 
@@ -310,7 +312,10 @@
   void *trampoline_table;
   void *trampoline_table_entry;
 #else
-  char trampFFI_TRAMPOLINE_SIZE;
+  union {
+    char trampFFI_TRAMPOLINE_SIZE;
+    void *ftramp;
+  };
 #endif
   ffi_cif   *cif;
   void     (*fun)(ffi_cif*,void*,void**,void*);
@@ -330,6 +335,14 @@
 FFI_API void *ffi_closure_alloc (size_t size, void **code);
 FFI_API void ffi_closure_free (void *);
 
+#if defined(PA_LINUX) || defined(PA_HPUX)
+#define FFI_CLOSURE_PTR(X) ((void *)((unsigned int)(X) | 2))
+#define FFI_RESTORE_PTR(X) ((void *)((unsigned int)(X) & ~3))
+#else
+#define FFI_CLOSURE_PTR(X) (X)
+#define FFI_RESTORE_PTR(X) (X)
+#endif
+
 FFI_API ffi_status
 ffi_prep_closure (ffi_closure*,
 		  ffi_cif *,
@@ -363,8 +376,8 @@
 
 #if !FFI_NATIVE_RAW_API
 
-  /* If this is enabled, then a raw closure has the same layout 
-     as a regular closure.  We use this to install an intermediate 
+  /* If this is enabled, then a raw closure has the same layout
+     as a regular closure.  We use this to install an intermediate
      handler to do the transaltion, void** -> ffi_raw*.  */
 
   void     (*translate_args)(ffi_cif*,void*,void**,void*);
@@ -389,8 +402,8 @@
 
 #if !FFI_NATIVE_RAW_API
 
-  /* If this is enabled, then a raw closure has the same layout 
-     as a regular closure.  We use this to install an intermediate 
+  /* If this is enabled, then a raw closure has the same layout
+     as a regular closure.  We use this to install an intermediate
      handler to do the translation, void** -> ffi_raw*.  */
 
   void     (*translate_args)(ffi_cif*,void*,void**,void*);
@@ -421,14 +434,14 @@
 ffi_prep_java_raw_closure (ffi_java_raw_closure*,
 		           ffi_cif *cif,
 		           void (*fun)(ffi_cif*,void*,ffi_java_raw*,void*),
-		           void *user_data);
+		           void *user_data) __attribute__((deprecated));
 
 FFI_API ffi_status
 ffi_prep_java_raw_closure_loc (ffi_java_raw_closure*,
 			       ffi_cif *cif,
 			       void (*fun)(ffi_cif*,void*,ffi_java_raw*,void*),
 			       void *user_data,
-			       void *codeloc);
+			       void *codeloc) __attribute__((deprecated));
 #endif
 
 #endif /* FFI_CLOSURES */
@@ -451,7 +464,7 @@
 
 /* ---- Public interface definition -------------------------------------- */
 
-FFI_API 
+FFI_API
 ffi_status ffi_prep_cif(ffi_cif *cif,
 			ffi_abi abi,
 			unsigned int nargs,
@@ -484,18 +497,18 @@
 #endif
 
 /* If these change, update src/mips/ffitarget.h. */
-#define FFI_TYPE_VOID       0    
+#define FFI_TYPE_VOID       0
 #define FFI_TYPE_INT        1
-#define FFI_TYPE_FLOAT      2    
+#define FFI_TYPE_FLOAT      2
 #define FFI_TYPE_DOUBLE     3
 #if 0
 #define FFI_TYPE_LONGDOUBLE 4
 #else
 #define FFI_TYPE_LONGDOUBLE FFI_TYPE_DOUBLE
 #endif
-#define FFI_TYPE_UINT8      5   
+#define FFI_TYPE_UINT8      5
 #define FFI_TYPE_SINT8      6
-#define FFI_TYPE_UINT16     7 
+#define FFI_TYPE_UINT16     7
 #define FFI_TYPE_SINT16     8
 #define FFI_TYPE_UINT32     9
 #define FFI_TYPE_SINT32     10

_service:tar_scm:cffi-1.15.0.tar.gz/c/libffi_arm64/include/fficonfig.h -> _service:tar_scm:cffi-1.15.1.tar.gz/c/libffi_arm64/include/fficonfig.h Changed

@@ -18,6 +18,9 @@
 /* Define this if you want extra debugging. */
 /* #undef FFI_DEBUG */
 
+/* Define this if you want statically defined trampolines */
+/* #undef FFI_EXEC_STATIC_TRAMP */
+
 /* Cannot use PROT_EXEC on this target, so, we revert to alternative means */
 /* #undef FFI_EXEC_TRAMPOLINE_TABLE */
 
@@ -77,12 +80,18 @@
 /* Define to 1 if you have the `memcpy' function. */
 /* #undef HAVE_MEMCPY */
 
+/* Define to 1 if you have the `memfd_create' function. */
+/* #undef HAVE_MEMFD_CREATE */
+
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
 /* Define to 1 if you have the `mkostemp' function. */
 /* #undef HAVE_MKOSTEMP */
 
+/* Define to 1 if you have the `mkstemp' function. */
+/* #undef HAVE_MKSTEMP */
+
 /* Define to 1 if you have the `mmap' function. */
 /* #undef HAVE_MMAP */
 
@@ -95,6 +104,9 @@
 /* Define if read-only mmap of a plain file works. */
 /* #undef HAVE_MMAP_FILE */
 
+/* Define if your compiler supports pointer authentication. */
+/* #undef HAVE_PTRAUTH */
+
 /* Define if .eh_frame sections should be read-only. */
 /* #undef HAVE_RO_EH_FRAME */
 
@@ -110,6 +122,9 @@
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
+/* Define to 1 if you have the <sys/memfd.h> header file. */
+/* #undef HAVE_SYS_MEMFD_H */
+
 /* Define to 1 if you have the <sys/mman.h> header file. */
 /* #undef HAVE_SYS_MMAN_H */
 
@@ -138,7 +153,7 @@
 #define PACKAGE_NAME "libffi"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libffi 3.3-rc0"
+#define PACKAGE_STRING "libffi 3.4.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libffi"
@@ -147,7 +162,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.3-rc0"
+#define PACKAGE_VERSION "3.4.2"
 
 /* The size of `double', as computed by sizeof. */
 #define SIZEOF_DOUBLE 8
@@ -177,7 +192,7 @@
 /* #undef USING_PURIFY */
 
 /* Version number of package */
-#define VERSION "3.3-rc0"
+#define VERSION "3.4.2"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

_service:tar_scm:cffi-1.15.0.tar.gz/c/libffi_arm64/include/ffitarget.h -> _service:tar_scm:cffi-1.15.1.tar.gz/c/libffi_arm64/include/ffitarget.h Changed

@@ -32,7 +32,7 @@
 #define FFI_SIZEOF_JAVA_RAW  4
 typedef unsigned long long ffi_arg;
 typedef signed long long ffi_sarg;
-#elif defined(_M_ARM64)
+#elif defined(_WIN32)
 #define FFI_SIZEOF_ARG 8
 typedef unsigned long long ffi_arg;
 typedef signed long long ffi_sarg;
@@ -45,8 +45,13 @@
   {
     FFI_FIRST_ABI = 0,
     FFI_SYSV,
+    FFI_WIN64,
     FFI_LAST_ABI,
+#if defined(_WIN32)
+    FFI_DEFAULT_ABI = FFI_WIN64
+#else
     FFI_DEFAULT_ABI = FFI_SYSV
+#endif
   } ffi_abi;
 #endif
 
@@ -69,22 +74,22 @@
 #define FFI_TRAMPOLINE_CLOSURE_OFFSET FFI_TRAMPOLINE_SIZE
 #endif
 
-#ifdef _M_ARM64
+#ifdef _WIN32
 #define FFI_EXTRA_CIF_FIELDS unsigned is_variadic
 #endif
+#define FFI_TARGET_SPECIFIC_VARIADIC
 
 /* ---- Internal ---- */
 
 #if defined (__APPLE__)
-#define FFI_TARGET_SPECIFIC_VARIADIC
 #define FFI_EXTRA_CIF_FIELDS unsigned aarch64_nfixedargs
-#elif !defined(_M_ARM64)
+#elif !defined(_WIN32)
 /* iOS and Windows reserve x18 for the system.  Disable Go closures until
    a new static chain is chosen.  */
 #define FFI_GO_CLOSURES 1
 #endif
 
-#ifndef _M_ARM64
+#ifndef _WIN32
 /* No complex type on Windows */
 #define FFI_TARGET_HAS_COMPLEX_TYPE
 #endif

_service:tar_scm:cffi-1.15.0.tar.gz/c/test_c.py -> _service:tar_scm:cffi-1.15.1.tar.gz/c/test_c.py Changed

@@ -1,5 +1,15 @@
 import py
 import pytest
+import sys
+
+is_musl = False
+if sys.platform == 'linux':
+    try:
+        from packaging.tags import platform_tags
+        is_musl = any(t.startswith('musllinux') for t in platform_tags())
+        del platform_tags
+    except ImportError:
+        pass
 
 def _setup_path():
     import os, sys
@@ -17,7 +27,7 @@
 # ____________________________________________________________
 
 import sys
-assert __version__ == "1.15.0", ("This test_c.py file is for testing a version"
+assert __version__ == "1.15.1", ("This test_c.py file is for testing a version"
                                  " of cffi that differs from the one that we"
                                  " get from 'import _cffi_backend'")
 if sys.version_info < (3,):
@@ -93,7 +103,8 @@
     if sys.platform.startswith("linux"):
         RTLD_NODELETE
         RTLD_NOLOAD
-        RTLD_DEEPBIND
+        if not is_musl:
+            RTLD_DEEPBIND
 
 def test_new_primitive_type():
     py.test.raises(KeyError, new_primitive_type, "foo")
@@ -1296,7 +1307,7 @@
 def test_write_variable():
     ## FIXME: this test assumes glibc specific behavior, it's not compliant with C standard
     ## https://bugs.pypy.org/issue1643
-    if not sys.platform.startswith("linux"):
+    if not sys.platform.startswith("linux") or is_musl:
         py.test.skip("untested")
     BVoidP = new_pointer_type(new_void_type())
     ll = find_and_load_library('c')
@@ -1331,9 +1342,11 @@
     except ImportError:
         import io as cStringIO    # Python 3
     import linecache
-    def matches(istr, ipattern, ipattern38):
+    def matches(istr, ipattern, ipattern38, ipattern311):
         if sys.version_info >= (3, 8):
             ipattern = ipattern38
+        if sys.version_info >= (3, 11):
+            ipattern = ipattern311
         str, pattern = istr, ipattern
         while '$' in pattern:
             i = pattern.index('$')
@@ -1387,6 +1400,16 @@
   File "$", line $, in check_value
     $
 ValueError: 42
+""", """\
+Exception ignored from cffi callback <function$Zcb1 at 0x$>:
+Traceback (most recent call last):
+  File "$", line $, in Zcb1
+    $
+    $
+  File "$", line $, in check_value
+    $
+    $
+ValueError: 42
 """)
         sys.stderr = cStringIO.StringIO()
         bigvalue = 20000
@@ -1401,6 +1424,13 @@
   File "$", line $, in test_callback_exception
     $
 OverflowError: integer 60000 does not fit 'short'
+""", """\
+Exception ignored from cffi callback <function$Zcb1 at 0x$>, trying to convert the result back to C:
+Traceback (most recent call last):
+  File "$", line $, in test_callback_exception
+    $
+    $
+OverflowError: integer 60000 does not fit 'short'
 """)
         sys.stderr = cStringIO.StringIO()
         bigvalue = 20000
@@ -1449,6 +1479,19 @@
   File "$", line $, in test_callback_exception
     $
 TypeError: $integer$
+""", """\
+Exception ignored from cffi callback <function$Zcb1 at 0x$>, trying to convert the result back to C:
+Traceback (most recent call last):
+  File "$", line $, in test_callback_exception
+    $
+    $
+OverflowError: integer 60000 does not fit 'short'
+Exception ignored during handling of the above exception by 'onerror':
+Traceback (most recent call last):
+  File "$", line $, in test_callback_exception
+    $
+    $
+TypeError: $integer$
 """)
         #
         sys.stderr = cStringIO.StringIO()
@@ -1478,6 +1521,19 @@
   File "$", line $, in oops
     $
 AttributeError: 'str' object has no attribute 'append$
+""", """\
+Exception ignored from cffi callback <function$Zcb1 at 0x$>, trying to convert the result back to C:
+Traceback (most recent call last):
+  File "$", line $, in test_callback_exception
+    $
+    $
+OverflowError: integer 60000 does not fit 'short'
+Exception ignored during handling of the above exception by 'onerror':
+Traceback (most recent call last):
+  File "$", line $, in oops
+    $
+    $
+AttributeError: 'str' object has no attribute 'append$
 """)
     finally:
         sys.stderr = orig_stderr
@@ -3453,6 +3509,18 @@
     _test_bitfield_details(flag=SF_GCC_X86_BITFIELDS|SF_GCC_BIG_ENDIAN)
 
 
+def buffer_warning(cdata):
+    import warnings
+    buf = buffer(cdata)
+    bytes = len(buf)
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter("always")
+        buffer(cdata, bytes)
+        assert len(w) == 0
+        buffer(cdata, bytes + 1)
+        assert len(w) <= 1
+        return len(w) == 1
+
 def test_struct_array_no_length():
     BInt = new_primitive_type("int")
     BIntP = new_pointer_type(BInt)
@@ -3567,6 +3635,7 @@
     assert p.a1 == 20
     assert p.a2 == 30
     assert p.a3 == 0
+    assert buffer_warning(p)
     #
     # struct of struct of varsized array
     BStruct2 = new_struct_type("bar")
@@ -3575,6 +3644,20 @@
     for i in range(2):   # try to detect heap overwrites
         p = newp(new_pointer_type(BStruct2), 100, 200, list(range(50)))
         assert p.tail.y49 == 49
+    assert buffer_warning(p)
+    assert not buffer_warning(cast(new_pointer_type(BStruct2), p))
+    assert not buffer_warning(cast(BIntP, p))
+
+def test_more_buffer_warning():
+    BChar = new_primitive_type("unsigned char")
+    BCharP = new_pointer_type(BChar)
+    BArray = new_array_type(BCharP, 10)   # char10
+    p = newp(BArray)
+    assert buffer_warning(p)
+    assert not buffer_warning(cast(BCharP, p))
+    p = newp(BCharP)
+    assert buffer_warning(p)
+    assert not buffer_warning(cast(BCharP, p))
 
 
 def test_struct_array_no_length_explicit_position():

_service:tar_scm:cffi-1.15.0.tar.gz/cffi.egg-info/PKG-INFO -> _service:tar_scm:cffi-1.15.1.tar.gz/cffi.egg-info/PKG-INFO Changed

_service:tar_scm:cffi-1.15.0.tar.gz/cffi.egg-info/SOURCES.txt -> _service:tar_scm:cffi-1.15.1.tar.gz/cffi.egg-info/SOURCES.txt Changed

_service:tar_scm:cffi-1.15.0.tar.gz/cffi.egg-info/entry_points.txt -> _service:tar_scm:cffi-1.15.1.tar.gz/cffi.egg-info/entry_points.txt Changed

_service:tar_scm:cffi-1.15.0.tar.gz/cffi/__init__.py -> _service:tar_scm:cffi-1.15.1.tar.gz/cffi/__init__.py Changed

_service:tar_scm:cffi-1.15.0.tar.gz/cffi/_embedding.h -> _service:tar_scm:cffi-1.15.1.tar.gz/cffi/_embedding.h Changed

_service:tar_scm:cffi-1.15.0.tar.gz/cffi/recompiler.py -> _service:tar_scm:cffi-1.15.1.tar.gz/cffi/recompiler.py Changed

_service:tar_scm:cffi-1.15.0.tar.gz/doc/source/conf.py -> _service:tar_scm:cffi-1.15.1.tar.gz/doc/source/conf.py Changed

_service:tar_scm:cffi-1.15.0.tar.gz/doc/source/installation.rst -> _service:tar_scm:cffi-1.15.1.tar.gz/doc/source/installation.rst Changed

_service:tar_scm:cffi-1.15.0.tar.gz/doc/source/overview.rst -> _service:tar_scm:cffi-1.15.1.tar.gz/doc/source/overview.rst Changed

_service:tar_scm:cffi-1.15.0.tar.gz/doc/source/ref.rst -> _service:tar_scm:cffi-1.15.1.tar.gz/doc/source/ref.rst Changed

@@ -846,20 +846,35 @@
    argument is identical to a ``item`` argument (and ``ffi.cdef()``
    doesn't record the difference).  So when you call such a function,
    you can pass an argument that is accepted by either C type, like
-   for example passing a Python string to a ``char *`` argument
+   for example passing a Python byte string to a ``char *`` argument
    (because it works for ``char`` arguments) or a list of integers
    to a ``int *`` argument (it works for ``int`` arguments).  Note
    that even if you want to pass a single ``item``, you need to
    specify it in a list of length 1; for example, a ``struct point_s
    *`` argument might be passed as ``x, y`` or ``{'x': 5, 'y':
-   10}``.
+   10}``.  In all these cases (including passing a byte string to
+   a ``char *`` argument), the required C data structure is created
+   just before the call is done, and freed afterwards.
 
    As an optimization, CFFI assumes that a
-   function with a ``char *`` argument to which you pass a Python
+   function with a ``char *`` argument to which you pass a Python byte
    string will not actually modify the array of characters passed in,
-   and so passes directly a pointer inside the Python string object.
+   and so it attempts to pass directly a pointer inside the Python
+   byte string object.  This still doesn't mean that the ``char *``
+   argument can be stored by the C function and inspected later.
+   The ``char *`` is only valid for the duration of the call, even if
+   the Python object is kept alive for longer.
    (On PyPy, this optimization is only available since PyPy 5.4
-   with CFFI 1.8.)
+   with CFFI 1.8.  It may fail in rare cases and fall back to making
+   a copy anyway, but only for short strings so it shouldn't be
+   noticeable.)
+
+   If you need to pass a ``char *`` that must be valid for longer than
+   just the call, you need to build it explicitly, either with ``p =
+   ffi.new("char", mystring)`` (which makes a copy) or by not using a
+   byte string in the first place but something else like a buffer object,
+   or a bytearray and ``ffi.from_buffer()``; or just use
+   ``ffi.new("char", length)`` directly if possible.
 
 `2` C function calls are done with the GIL released.

_service:tar_scm:cffi-1.15.0.tar.gz/doc/source/using.rst -> _service:tar_scm:cffi-1.15.1.tar.gz/doc/source/using.rst Changed

@@ -383,6 +383,18 @@
 
     assert lib.strlen("hello") == 5
 
+(Note that there is no guarantee that the ``char *`` passed to the
+function remains valid after the call is done.  Similarly, if you write
+``lib.f(x); lib.f(x)`` where ``x`` is a variable containing a byte string,
+the two calls to ``f()`` could sometimes receive different ``char *``
+pointers, with each of them only valid during the corresponding call.  This is
+important notably for PyPy which uses many optimizations tweaking the data
+underlying a byte string object.  CFFI will not make and free a copy of
+the whole string at *every* call---it usually won't---but you *cannot*
+write code that relies on it: there are cases were that would break.
+If you need a pointer to remain valid, you need to make one explicitly,
+for example with ``ptr = ffi.new("char", x)``.)
+
 You can also pass unicode strings as ``wchar_t *`` or ``char16_t *`` or
 ``char32_t *`` arguments.  Note that
 the C language makes no difference between argument declarations that

_service:tar_scm:cffi-1.15.0.tar.gz/doc/source/whatsnew.rst -> _service:tar_scm:cffi-1.15.1.tar.gz/doc/source/whatsnew.rst Changed

_service:tar_scm:cffi-1.15.0.tar.gz/setup.py -> _service:tar_scm:cffi-1.15.1.tar.gz/setup.py Changed

@@ -11,7 +11,7 @@
 libraries = 'ffi'
 include_dirs = '/usr/include/ffi',
                 '/usr/include/libffi'    # may be changed by pkg-config
-define_macros = 
+define_macros = ('FFI_BUILDING', '1')   # for linking with libffi static library
 library_dirs = 
 extra_compile_args = 
 extra_link_args = 
@@ -156,6 +156,11 @@
     include_dirs.append('/usr/local/include')
     library_dirs.append('/usr/local/lib')
 
+forced_extra_objs = os.environ.get('CFFI_FORCE_STATIC', )
+if forced_extra_objs:
+    forced_extra_objs = forced_extra_objs.split(';')
+
+
 if __name__ == '__main__':
     from setuptools import setup, Distribution, Extension
 
@@ -186,7 +191,7 @@
 
 `Mailing list <https://groups.google.com/forum/#!forum/python-cffi>`_
 """,
-        version='1.15.0',
+        version='1.15.1',
         packages='cffi' if cpython else ,
         package_data={'cffi': '_cffi_include.h', 'parse_c_type.h', 
                                '_embedding.h', '_cffi_errors.h'}
@@ -209,6 +214,7 @@
             library_dirs=library_dirs,
             extra_compile_args=extra_compile_args,
             extra_link_args=extra_link_args,
+            extra_objects=forced_extra_objs,
         ) if cpython else ,
 
         install_requires=

_service:tar_scm:cffi-1.15.0.tar.gz/testing/cffi0/test_function.py -> _service:tar_scm:cffi-1.15.1.tar.gz/testing/cffi0/test_function.py Changed

@@ -5,7 +5,7 @@
 import ctypes.util
 from cffi.backend_ctypes import CTypesBackend
 from testing.udir import udir
-from testing.support import FdWriteCapture, StdErrCapture
+from testing.support import FdWriteCapture, StdErrCapture, is_musl
 from .backend_tests import needs_dlopen_none
 
 try:
@@ -13,6 +13,12 @@
 except ImportError:
     from io import StringIO
 
+try:
+    from packaging.tags import platform_tags
+    _platform_tags_cached = set(platform_tags())
+    _is_musl = any(t.startswith('musllinux') for t in _platform_tags_cached)
+except ImportError:
+    _is_musl = False
 
 lib_m = 'm'
 if sys.platform == 'win32':
@@ -20,6 +26,8 @@
     import distutils.ccompiler
     if distutils.ccompiler.get_default_compiler() == 'msvc':
         lib_m = 'msvcrt'
+elif is_musl:
+    lib_m = 'c'
 
 class TestFunction(object):
     Backend = CTypesBackend
@@ -165,11 +173,15 @@
                           ffi.cast("long long", 168))
             ffi.C.fprintf(ffi.C.stderr, b"hello %p\n", ffi.NULL)
         res = fd.getvalue()
+        if is_musl:
+            nil_repr = b'0'
+        else:
+            nil_repr = b'(nil)'
         assert res == (b"hello with no arguments\n"
                        b"hello, world!\n"
                        b"hello, world2!\n"
                        b"hello int 42 long 84 long long 168\n"
-                       b"hello (nil)\n")
+                       b"hello " + nil_repr + b"\n")
 
     def test_must_specify_type_of_vararg(self):
         ffi = FFI(backend=self.Backend())
@@ -265,7 +277,7 @@
         assert res == 5
 
     def test_write_variable(self):
-        if not sys.platform.startswith('linux'):
+        if not sys.platform.startswith('linux') or _is_musl:
             py.test.skip("probably no symbol 'stdout' in the lib")
         ffi = FFI(backend=self.Backend())
         ffi.cdef("""

_service:tar_scm:cffi-1.15.0.tar.gz/testing/cffi0/test_ownlib.py -> _service:tar_scm:cffi-1.15.1.tar.gz/testing/cffi0/test_ownlib.py Changed

_service:tar_scm:cffi-1.15.0.tar.gz/testing/cffi0/test_parsing.py -> _service:tar_scm:cffi-1.15.1.tar.gz/testing/cffi0/test_parsing.py Changed

_service:tar_scm:cffi-1.15.0.tar.gz/testing/cffi0/test_unicode_literals.py -> _service:tar_scm:cffi-1.15.1.tar.gz/testing/cffi0/test_unicode_literals.py Changed

_service:tar_scm:cffi-1.15.0.tar.gz/testing/cffi0/test_verify.py -> _service:tar_scm:cffi-1.15.1.tar.gz/testing/cffi0/test_verify.py Changed

_service:tar_scm:cffi-1.15.0.tar.gz/testing/cffi1/test_cffi_binary.py -> _service:tar_scm:cffi-1.15.1.tar.gz/testing/cffi1/test_cffi_binary.py Changed

@@ -1,10 +1,11 @@
 import py, sys, os
 import _cffi_backend
+from testing.support import is_musl
 
 def test_no_unknown_exported_symbols():
     if not hasattr(_cffi_backend, '__file__'):
         py.test.skip("_cffi_backend module is built-in")
-    if not sys.platform.startswith('linux'):
+    if not sys.platform.startswith('linux') or is_musl:
         py.test.skip("linux-only")
     g = os.popen("objdump -T '%s'" % _cffi_backend.__file__, 'r')
     for line in g:
@@ -17,6 +18,9 @@
         name = line.split()-1
         if name.startswith('_') or name.startswith('.'):
             continue
-        if name not in ('init_cffi_backend', 'PyInit__cffi_backend'):
+        # a statically-linked libffi will always appear here without header hackage, ignore it if it's internal
+        if name.startswith('ffi_') and 'Base' in line:
+            continue
+        if name not in ('init_cffi_backend', 'PyInit__cffi_backend', 'cffistatic_ffi_call'):
             raise Exception("Unexpected exported name %r" % (name,))
     g.close()

_service:tar_scm:cffi-1.15.0.tar.gz/testing/cffi1/test_re_python.py -> _service:tar_scm:cffi-1.15.1.tar.gz/testing/cffi1/test_re_python.py Changed

_service:tar_scm:cffi-1.15.0.tar.gz/testing/cffi1/test_verify1.py -> _service:tar_scm:cffi-1.15.1.tar.gz/testing/cffi1/test_verify1.py Changed

_service:tar_scm:cffi-1.15.1.tar.gz/testing/embedding/empty-test.c Added

_service:tar_scm:cffi-1.15.0.tar.gz/testing/embedding/empty.py -> _service:tar_scm:cffi-1.15.1.tar.gz/testing/embedding/empty.py Changed

_service:tar_scm:cffi-1.15.0.tar.gz/testing/embedding/test_basic.py -> _service:tar_scm:cffi-1.15.1.tar.gz/testing/embedding/test_basic.py Changed

_service:tar_scm:cffi-1.15.0.tar.gz/testing/support.py -> _service:tar_scm:cffi-1.15.1.tar.gz/testing/support.py Changed

Changes of Revision 2