From 74de7dd66da294a552231715558964dc88896e01 Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Thu, 28 Jul 2011 10:52:45 +0000 Subject: [PATCH] - Fix #55301 (url scanner part) check if malloc succeded --- ext/standard/url_scanner_ex.c | 7 +++++-- ext/standard/url_scanner_ex.re | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c index f9c017ff93..d883d4dfa3 100644 --- a/ext/standard/url_scanner_ex.c +++ b/ext/standard/url_scanner_ex.c @@ -57,9 +57,12 @@ static PHP_INI_MH(OnUpdateTags) if (ctx->tags) zend_hash_destroy(ctx->tags); - else + else { ctx->tags = malloc(sizeof(HashTable)); - + if (!ctx->tags) { + return FAILURE; + } + } zend_hash_init(ctx->tags, 0, NULL, NULL, 1); for (key = php_strtok_r(tmp, ",", &lasts); diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re index 7994925b1c..e7218a14f1 100644 --- a/ext/standard/url_scanner_ex.re +++ b/ext/standard/url_scanner_ex.re @@ -55,9 +55,13 @@ static PHP_INI_MH(OnUpdateTags) if (ctx->tags) zend_hash_destroy(ctx->tags); - else + else { ctx->tags = malloc(sizeof(HashTable)); - + if (!ctx->tags) { + return FAILURE; + } + } + zend_hash_init(ctx->tags, 0, NULL, NULL, 1); for (key = php_strtok_r(tmp, ",", &lasts); -- 2.40.0