pacparser 1.5.3__tar.gz → 1.5.3.dev2__tar.gz

{pacparser-1.5.3/pacparser.egg-info → pacparser-1.5.3.dev2}/PKG-INFO

@@ -1,10 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pacparser
-Version: 1.5.3
+Version: 1.5.3.dev2
 Summary: Pacparser package
 Home-page: https://github.com/manugarg/pacparser
 Author: Manu Garg
 Author-email: manugarg@gmail.com
 License: LGPL
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: summary
 
 python library to parse proxy auto-config (PAC) files.

{pacparser-1.5.3 → pacparser-1.5.3.dev2}/pacparser.c

@@ -99,7 +99,8 @@ read_file_into_str(const char *filename)
   if (file_size == -1) goto error2;
   if (fseek(fptr, 0L, SEEK_SET) != 0) goto error2;
 
-  char *str = (char*) malloc(file_size+1);
+  // calloc zero-fills the buffer, so the string is already NUL-terminated.
+  char *str = (char*) calloc(file_size+1, 1);
   if (str == NULL) goto error2;
 
   // Read the file into the string
@@ -109,12 +110,6 @@ read_file_into_str(const char *filename)
     goto error2;
   }
 
-  // This check should not be needed but adding this satisfies
-  // sonarlint static analysis, otherwise it complains about tainted
-  // index.
-  if (bytes_read < file_size+1) {
-    str[bytes_read] = '\0';
-  }
   fclose(fptr);
   return str;
 error2:

{pacparser-1.5.3 → pacparser-1.5.3.dev2/pacparser.egg-info}/PKG-INFO

@@ -1,10 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pacparser
-Version: 1.5.3
+Version: 1.5.3.dev2
 Summary: Pacparser package
 Home-page: https://github.com/manugarg/pacparser
 Author: Manu Garg
 Author-email: manugarg@gmail.com
 License: LGPL
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: summary
 
 python library to parse proxy auto-config (PAC) files.

{pacparser-1.5.3 → pacparser-1.5.3.dev2}/setup.py

@@ -246,24 +246,24 @@ def build_c_objects(cc):
 def main(patched_func):
     python_home = os.path.dirname(sys.executable)
 
-    obj_search_path = {
-        "pacparser.o": ["..", "."],
-        "libquickjs.a": ["../quickjs", "quickjs", "."],
-    }
-    found_objects = {}
-    for obj, paths in obj_search_path.items():
-        for path in paths:
-            if os.path.exists(os.path.join(path, obj)):
-                found_objects[obj] = os.path.join(path, obj)
-                break
-
-    # When building from the sdist, the C sources are copied to the setup
-    # directory but the prebuilt objects are not, so compile them. The
-    # copied pacparser.c is the marker for the sdist layout; in the source
-    # tree the sources live in the parent directory and are built by the
-    # Makefile. Only do this for commands that build the extension, so
-    # that other commands (sdist, egg_info, clean, ...) do not require a
-    # C toolchain.
+    # When the C sources are next to setup.py (an unpacked sdist, or the
+    # cibuildwheel build, which copies them in), the objects must be built
+    # from them inside this tree: never link objects or include headers from
+    # the parent directory, which is outside the package and may be writable
+    # by other users (pip unpacks local sdists directly under $TMPDIR). In
+    # the source tree, the Makefile builds the objects in the parent
+    # directory (src/).
+    local_sources = os.path.exists("pacparser.c")
+    if local_sources:
+        include_dirs = ["."]
+        extra_objects = ["pacparser.o", os.path.join("quickjs", "libquickjs.a")]
+    else:
+        include_dirs = [".."]
+        extra_objects = ["../pacparser.o", "../quickjs/libquickjs.a"]
+
+    # Only compile the sdist's objects for commands that build the
+    # extension, so that other commands (sdist, egg_info, clean, ...) do
+    # not require a C toolchain.
     build_commands = ("build", "build_ext", "bdist", "bdist_wheel", "install")
     building = sys.platform != "win32" and any(
         cmd in build_commands for cmd in sys.argv[1:])
@@ -272,18 +272,8 @@ def main(patched_func):
         # also what makes setuptools use a working compiler for the
         # extension itself.
         cc = find_build_tool("CC", "cc")
-    if (
-        len(found_objects) < len(obj_search_path)
-        and building
-        and os.path.exists("pacparser.c")
-    ):
-        build_c_objects(cc)
-        found_objects["pacparser.o"] = found_objects.get(
-            "pacparser.o", "pacparser.o")
-        found_objects["libquickjs.a"] = found_objects.get(
-            "libquickjs.a", os.path.join("quickjs", "libquickjs.a"))
-
-    extra_objects = list(found_objects.values())
+        if local_sources:
+            build_c_objects(cc)
 
     libraries = ["pthread"]
     extra_link_args = []
@@ -292,13 +282,12 @@ def main(patched_func):
         import distutils.cygwinccompiler
 
         distutils.cygwinccompiler.get_msvcr = lambda: ["vcruntime140"]
-        extra_objects = ["../pacparser.o", "../quickjs/libquickjs.a"]
         libraries = ["ws2_32"]
         extra_link_args = ["-static-libgcc", "-L" + python_home]
 
     pacparser_module = setuptools.Extension(
         "_pacparser",
-        include_dirs=["..", "."],
+        include_dirs=include_dirs,
         sources=["pacparser_py.c"],
         libraries=libraries,
         extra_link_args=extra_link_args,

pacparser-1.5.3.dev2/version.mk

@@ -0,0 +1 @@
+VERSION=1.5.3.dev2

pacparser-1.5.3/version.mk

@@ -1 +0,0 @@
-VERSION=1.5.3