More error checks

weltling · weltling · commit 15e509448ae9 · 2017-11-09T14:09:33.000+01:00
diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
@@ -426,8 +426,10 @@ check_fmt(struct magic_set *ms, struct magic *m)
 		rv = -1;
 	} else {
 		pcre2_match_data *match_data = pcre2_match_data_create_from_pattern(pce, php_pcre_gctx());
-		rv = pcre2_match(pce, m->desc, strlen(m->desc), 0, re_options, match_data, php_pcre_mctx()) > 0;
-		pcre2_match_data_free(match_data);
+		if (match_data) {
+			rv = pcre2_match(pce, m->desc, strlen(m->desc), 0, re_options, match_data, php_pcre_mctx()) > 0;
+			pcre2_match_data_free(match_data);
+		}
 	}
 	zend_string_release(pattern);
 	(void)setlocale(LC_CTYPE, "");
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
@@ -446,6 +446,9 @@ void php_filter_validate_regexp(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 		RETURN_VALIDATION_FAILED
 	}
 	match_data = pcre2_match_data_create_from_pattern(re, php_pcre_gctx());
+	if (!match_data) {
+		RETURN_VALIDATION_FAILED
+	}
 	rc = pcre2_match(re, Z_STRVAL_P(value), Z_STRLEN_P(value), 0, preg_options, match_data, php_pcre_mctx());
 	pcre2_match_data_free(match_data);
 
@@ -631,6 +634,9 @@ void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 	}
 	zend_string_release(sregexp);
 	match_data = pcre2_match_data_create_from_pattern(re, php_pcre_gctx());
+	if (!match_data) {
+		RETURN_VALIDATION_FAILED
+	}
 	rc = pcre2_match(re, Z_STRVAL_P(value), Z_STRLEN_P(value), 0, preg_options, match_data, php_pcre_mctx());
 	pcre2_match_data_free(match_data);
 
diff --git a/ext/opcache/zend_accelerator_blacklist.c b/ext/opcache/zend_accelerator_blacklist.c
@@ -349,6 +349,10 @@ zend_bool zend_accel_blacklist_is_blacklisted(zend_blacklist *blacklist, char *v
 	}
 	while (regexp_list_it != NULL) {
 		pcre2_match_data *match_data = pcre2_match_data_create_from_pattern(regexp_list_it->re, gctx);
+		if (!match_data) {
+			/* Alloc failed, but next one could still come through and match. */
+			continue;
+		}
 		int rc = pcre2_match(regexp_list_it->re, verify_path, strlen(verify_path), 0, 0, match_data, mctx);
 		if (rc >= 0) {
 			ret = 1;
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -5791,6 +5791,11 @@ static int php_pgsql_convert_match(const char *str, size_t str_len, const char *
 	}
 
 	match_data = pcre2_match_data_create_from_pattern(re, php_pcre_gctx());
+	if (NULL == match_data) {
+		pcre2_code_free(re);
+		php_error_docref(NULL, E_WARNING, "Cannot allocate match data");
+		return FAILURE;
+	}
 	res = pcre2_match(re, str, str_len, 0, 0, match_data, php_pcre_mctx());
 	pcre2_match_data_free(match_data);
 	pcre2_code_free(re);
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
@@ -2062,7 +2062,9 @@ SPL_METHOD(RegexIterator, accept)
 		case REGIT_MODE_MATCH:
 			re = php_pcre_pce_re(intern->u.regex.pce);
 			match_data = pcre2_match_data_create_from_pattern(re, php_pcre_gctx());
-			/* XXX error check. */
+			if (!match_data) {
+				RETURN_FALSE;
+			}
 			rc = pcre2_match(re, ZSTR_VAL(subject), ZSTR_LEN(subject), 0, 0, match_data, php_pcre_mctx());
 			RETVAL_BOOL(rc >= 0);
 			pcre2_match_data_free(match_data);
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
@@ -699,6 +699,11 @@ int php_zip_pcre(zend_string *regexp, char *path, int path_len, zval *return_val
 			}
 
 			match_data = pcre2_match_data_create_from_pattern(re, gctx);
+			if (!match_data) {
+				/* Allocation failed, but can proceed to the next pattern. */
+				zend_string_release(namelist[i]);
+				continue;
+			}
 			rc = pcre2_match(re, ZSTR_VAL(namelist[i]), ZSTR_LEN(namelist[i]), 0, preg_options, match_data, mctx);
 			pcre2_match_data_free(match_data);
 			/* 0 means that the vector is too small to hold all the captured substring offsets */
