Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix memory leaks in fuzzer modules detected by cppchecker #18081 #18082

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions sapi/fuzzer/fuzzer-json.c
Original file line number Diff line number Diff line change
@@ -15,8 +15,6 @@
+----------------------------------------------------------------------+
*/



#include "fuzzer.h"

#include "Zend/zend.h"
@@ -31,14 +29,15 @@
#include "ext/json/php_json_parser.h"

int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
char *data = malloc(Size+1);
memcpy(data, Data, Size);
data[Size] = '\0';

if (fuzzer_request_startup() == FAILURE) {
if (fuzzer_request_startup() == FAILURE){
return 0;
}

char *data = malloc(Size + 1);
memcpy(data, Data, Size);
data[Size] = '\0';

for (int option = 0; option <=1; ++option) {
zval result;
php_json_parser parser;
9 changes: 5 additions & 4 deletions sapi/fuzzer/fuzzer-mbregex.c
Original file line number Diff line number Diff line change
@@ -30,15 +30,16 @@

int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
#ifdef HAVE_MBREGEX
char *args[2];
char *data = malloc(Size+1);
memcpy(data, Data, Size);
data[Size] = '\0';

if (fuzzer_request_startup() == FAILURE) {
return 0;
}

char *args[2];
char *data = malloc(Size+1);
memcpy(data, Data, Size);
data[Size] = '\0';

fuzzer_setup_dummy_frame();

args[0] = data;
7 changes: 4 additions & 3 deletions sapi/fuzzer/fuzzer-unserialize.c
Original file line number Diff line number Diff line change
@@ -30,14 +30,15 @@
#include "ext/standard/php_var.h"

int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
unsigned char *orig_data = malloc(Size+1);
memcpy(orig_data, Data, Size);
orig_data[Size] = '\0';

if (fuzzer_request_startup() == FAILURE) {
return 0;
}

unsigned char *orig_data = malloc(Size+1);
memcpy(orig_data, Data, Size);
orig_data[Size] = '\0';

fuzzer_setup_dummy_frame();

{
8 changes: 4 additions & 4 deletions sapi/fuzzer/fuzzer-unserializehash.c
Original file line number Diff line number Diff line change
@@ -34,15 +34,15 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t FullSize) {
}
++Start;

if (fuzzer_request_startup() == FAILURE) {
return 0;
}

size_t Size = (Data + FullSize) - Start;
unsigned char *orig_data = malloc(Size+1);
memcpy(orig_data, Start, Size);
orig_data[Size] = '\0';

if (fuzzer_request_startup() == FAILURE) {
return 0;
}

fuzzer_setup_dummy_frame();

{
Loading
Oops, something went wrong.