Misc issues

Author: cataphract

config.m4

@@ -34,6 +34,26 @@ if test "$PHP_LIBARCHIVE" != "no"; then
     -L$LIBARCHIVE_DIR/$PHP_LIBDIR
   ])
 
+  cflags_null=""
+  AC_DEFUN([CC_FLAG_CHECK],
+  [
+  ac_saved_cflags="$CFLAGS"
+  CFLAGS="$1 -Werror"
+  flag_to_add=m4_default([$2],[$1])
+  AC_MSG_CHECKING([whether the C compiler supports $1])
+  AC_COMPILE_IFELSE(
+    [AC_LANG_PROGRAM([])],
+    [AC_MSG_RESULT([yes])]
+    [cflags_null="$cflags_null $flag_to_add"],
+    [AC_MSG_RESULT([no])]
+  )
+  CFLAGS="$ac_saved_cflags"
+  ])
+  CC_FLAG_CHECK([-Wnullability-completeness], [-Wno-nullability-completeness])
+
+  extra_cflags="$cflags_null -fvisibility=hidden"
+  echo "EXTRA_CFLAGS := \$(EXTRA_CFLAGS) $extra_cflags" >> Makefile.fragments
+
   PHP_SUBST(ARCHIVE_SHARED_LIBADD)
-  PHP_NEW_EXTENSION(archive, libarchive.c stream.c, $ext_shared,,-fvisibility=hidden)
+  PHP_NEW_EXTENSION(archive, libarchive.c stream.c, $ext_shared,,-Wall)
 fi

libarchive.c

@@ -485,7 +485,6 @@ static void arch_it_dtor(zend_object_iterator *iter)
     arch_iterator *it = (arch_iterator *)iter;
 
     arch_it_invalidate_current((zend_object_iterator *) it);
-    arch_object *arch_obj = arch_object_from_zv(&it->parent.data);
     zval_ptr_dtor(&it->parent.data); // reduce refcount on archive
     it->finished = true;
 }
@@ -596,6 +595,8 @@ static PHP_MINIT_FUNCTION(libarchive)
    REGISTER_EXTRACT_CONST(HFS_COMPRESSION_FORCED);
    REGISTER_EXTRACT_CONST(SECURE_NOABSOLUTEPATHS);
    REGISTER_EXTRACT_CONST(CLEAR_NOCHANGE_FFLAGS);
+
+   return SUCCESS;
 }
 
 /* {{{ libarchive_module_entry

stream.c

@@ -36,8 +36,8 @@ static inline struct archive *nullable arch_from_stream(php_stream *stream)
     if (!arch) {
         php_error_docref(NULL, E_WARNING,
                          "libarchive handle has been disposed of already");
-        return NULL;
     }
+    return arch;
 }
 
 static stream_ret_t php_arch_ops_read(php_stream *stream, char *buf, size_t count)
@@ -117,4 +117,4 @@ php_stream *php_stream_arch_cur_entry_stream(zval *nonnull arch_zv)
     php_stream *stream = php_stream_alloc(
         &php_stream_arch_ops, arch_zv, NULL, "rb");
     return stream;
-}
+}