Bump

Author: danog

Zend/zend_extensions.c

@@ -19,7 +19,6 @@
 
 #include "zend_extensions.h"
 #include "zend_system_id.h"
-#include "SAPI.h"
 
 ZEND_API zend_llist zend_extensions;
 ZEND_API uint32_t zend_extension_flags = 0;

Zend/zend_portability.h

@@ -162,11 +162,14 @@
 #  define PHP_RTLD_MODE  RTLD_LAZY
 # endif
 
+/* True global */
+static bool use_deepbind = false;
+
 # if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT)
 #  define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
 # elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__) && !__has_feature(memory_sanitizer)
 #  if defined(LM_ID_NEWLM)
-#    define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | ((sapi_module.flags & SAPI_MODULE_FLAG_ISOLATE_SYMBOLS) != 0 ? RTLD_DEEPBIND : 0))
+#    define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | (use_deepbind ? RTLD_DEEPBIND : 0))
 #  else
 #    define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | RTLD_DEEPBIND)
 #  endif

main/SAPI.h

@@ -234,8 +234,6 @@ SAPI_API double sapi_get_request_time(void);
 SAPI_API void sapi_terminate_process(void);
 END_EXTERN_C()
 
-#define SAPI_MODULE_FLAG_ISOLATE_SYMBOLS (1<<0)
-
 struct _sapi_module_struct {
 	char *name;
 	char *pretty_name;
@@ -289,8 +287,6 @@ struct _sapi_module_struct {
 	const char *ini_entries;
 	const zend_function_entry *additional_functions;
 	unsigned int (*input_filter_init)(void);
-
-	unsigned int flags;
 };
 
 struct _sapi_post_entry {
@@ -325,25 +321,22 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data);
 SAPI_API SAPI_INPUT_FILTER_FUNC(php_default_input_filter);
 END_EXTERN_C()
 
-#define STANDARD_SAPI_MODULE_PROPERTIES STANDARD_SAPI_MODULE_PROPERTIES_WITH_FLAGS(0)
-
-#define STANDARD_SAPI_MODULE_PROPERTIES_WITH_FLAGS(_flags) \
-	NULL,    /* php_ini_path_override   */ \
-	NULL,    /* default_post_reader     */ \
-	NULL,    /* treat_data              */ \
-	NULL,    /* executable_location     */ \
-	0,       /* php_ini_ignore          */ \
-	0,       /* php_ini_ignore_cwd      */ \
-	NULL,    /* get_fd                  */ \
-	NULL,    /* force_http_10           */ \
-	NULL,    /* get_target_uid          */ \
-	NULL,    /* get_target_gid          */ \
-	NULL,    /* input_filter            */ \
-	NULL,    /* ini_defaults            */ \
-	0,       /* phpinfo_as_text;        */ \
-	NULL,    /* ini_entries;            */ \
-	NULL,    /* additional_functions    */ \
-	NULL,    /* input_filter_init       */ \
-	(_flags) /* flags                   */
+#define STANDARD_SAPI_MODULE_PROPERTIES \
+	NULL, /* php_ini_path_override   */ \
+	NULL, /* default_post_reader     */ \
+	NULL, /* treat_data              */ \
+	NULL, /* executable_location     */ \
+	0,    /* php_ini_ignore          */ \
+	0,    /* php_ini_ignore_cwd      */ \
+	NULL, /* get_fd                  */ \
+	NULL, /* force_http_10           */ \
+	NULL, /* get_target_uid          */ \
+	NULL, /* get_target_gid          */ \
+	NULL, /* input_filter            */ \
+	NULL, /* ini_defaults            */ \
+	0,    /* phpinfo_as_text;        */ \
+	NULL, /* ini_entries;            */ \
+	NULL, /* additional_functions    */ \
+	NULL  /* input_filter_init       */
 
 #endif /* SAPI_H */

sapi/litespeed/lsapilib.c

@@ -93,7 +93,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include <Zend/zend_portability.h>
-#include "main/SAPI.h"
 
 struct lsapi_MD5Context {
     uint32 buf[4];
@@ -2653,8 +2652,8 @@ int LSAPI_ParseSockAddr( const char * pBind, struct sockaddr * pAddr )
     {
     case '/':
         pAddr->sa_family = AF_UNIX;
-        strncpy( ((struct sockaddr_un *)pAddr)->sun_path, p,
-                sizeof(((struct sockaddr_un *)pAddr)->sun_path) );
+        memccpy(((struct sockaddr_un *)pAddr)->sun_path, p, 0,
+                sizeof(((struct sockaddr_un *)pAddr)->sun_path));
         return 0;
 
     case '[':

sapi/litespeed/lscriu.c

@@ -85,7 +85,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "lscriu.h"
 
 #include <Zend/zend_portability.h>
-#include "main/SAPI.h"
 
 #define  LSCRIU_PATH    256
 
@@ -418,7 +417,9 @@ static int LSCRIU_Native_Dump(pid_t iPid,
     memset(&criu_native_dump, 0, sizeof(criu_native_dump));
     criu_native_dump.m_iPidToDump = iPid;
     strncpy(criu_native_dump.m_chImageDirectory, pchImagePath,
-            sizeof(criu_native_dump.m_chImageDirectory));
+            sizeof(criu_native_dump.m_chImageDirectory) - 1);
+    criu_native_dump.m_chImageDirectory[
+        sizeof(criu_native_dump.m_chImageDirectory) - 1] = '\0';
     pchLastSlash = strrchr(criu_native_dump.m_chSocketDir,'/');
     if (pchLastSlash) {
         pchLastSlash++;

sapi/phpdbg/phpdbg_prompt.c

@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <string.h>
 #include "zend.h"
-#include "main/SAPI.h"
 #include "zend_compile.h"
 #include "zend_exceptions.h"
 #include "zend_vm.h"
@@ -703,6 +702,10 @@ static inline void phpdbg_handle_exception(void) /* {{{ */
 		EG(exception) = NULL;
 		msg = ZSTR_EMPTY_ALLOC();
 	} else {
+		if (UNEXPECTED(Z_ISREF(tmp))) {
+			zend_unwrap_reference(&tmp);
+		}
+		ZEND_ASSERT(Z_TYPE(tmp) == IS_STRING);
 		zend_update_property_string(zend_get_exception_base(ex), ex, ZEND_STRL("string"), Z_STRVAL(tmp));
 		zval_ptr_dtor(&tmp);
 		msg = zval_get_string(zend_read_property_ex(zend_get_exception_base(ex), ex, ZSTR_KNOWN(ZEND_STR_STRING), /* silent */ true, &rv));