From 150050a88a0fc4b5ef6cc7de642790ea8a8a4028 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 3 Nov 2020 11:01:20 +0100 Subject: fix segfault using patch from https://github.com/php-ds/ext-ds/pull/165 --- 0001-fix-missing-return-after-exception.patch | 39 +++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 0001-fix-missing-return-after-exception.patch (limited to '0001-fix-missing-return-after-exception.patch') diff --git a/0001-fix-missing-return-after-exception.patch b/0001-fix-missing-return-after-exception.patch new file mode 100644 index 0000000..68b3a99 --- /dev/null +++ b/0001-fix-missing-return-after-exception.patch @@ -0,0 +1,39 @@ +From 465cf909d98eb4f7c00c13ecb73e3d4c50e22e91 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Tue, 3 Nov 2020 10:34:40 +0100 +Subject: [PATCH 1/2] fix missing return after exception + +--- + src/php/handlers/php_common_handlers.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/php/handlers/php_common_handlers.c b/src/php/handlers/php_common_handlers.c +index 7d84dfb..e2441b2 100644 +--- a/src/php/handlers/php_common_handlers.c ++++ b/src/php/handlers/php_common_handlers.c +@@ -38,6 +38,7 @@ zval *php_ds_read_dimension_by_key_not_supported + (zval *obj, zval *offset, int type, zval *rv) { + #endif + ARRAY_ACCESS_BY_KEY_NOT_SUPPORTED(); ++ return NULL; + } + + int php_ds_has_dimension_by_key_not_supported +@@ -47,6 +48,7 @@ int php_ds_has_dimension_by_key_not_supported + (zval *obj, zval *offset, int check_empty) { + #endif + ARRAY_ACCESS_BY_KEY_NOT_SUPPORTED(); ++ return 0; + } + + void php_ds_unset_dimension_by_key_not_supported +@@ -56,4 +58,4 @@ void php_ds_unset_dimension_by_key_not_supported + (zval *obj, zval *offset) { + #endif + ARRAY_ACCESS_BY_KEY_NOT_SUPPORTED(); +-} +\ No newline at end of file ++} +-- +2.25.4 + -- cgit