From 942680bb4886369488b4594173b0e2191df8b1dc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Sep 2021 07:25:27 +0200 Subject: update to 1.1.4 run upstream test suite during build drop patches merged upstream --- uploadprogress-segfault.patch | 66 ------------------------------------------- 1 file changed, 66 deletions(-) delete mode 100644 uploadprogress-segfault.patch (limited to 'uploadprogress-segfault.patch') diff --git a/uploadprogress-segfault.patch b/uploadprogress-segfault.patch deleted file mode 100644 index 6e15157..0000000 --- a/uploadprogress-segfault.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b0e5f122b45ddbf7d7475b927e148d6dd5bf3c86 Mon Sep 17 00:00:00 2001 -From: "Christoph M. Becker" -Date: Fri, 30 Apr 2021 17:46:07 +0200 -Subject: [PATCH] Fix #79584: Segmentation fault in uploadprogress 1.1.0 and up - ---- - uploadprogress.c | 18 ++++++++---------- - 1 file changed, 8 insertions(+), 10 deletions(-) - -diff --git a/uploadprogress.c b/uploadprogress.c -index 6f72a92..ca3f17b 100644 ---- a/uploadprogress.c -+++ b/uploadprogress.c -@@ -105,30 +105,23 @@ static int uploadprogress_php_rfc1867_file(unsigned int event, void *event_data - } - - if (strcmp(e_data->name, "UPLOAD_IDENTIFIER") == 0) { -- char **upload_id; - char *template = INI_STR("uploadprogress.file.filename_template"); - - if (strcmp(template, "") == 0) { - return FAILURE; - } - -- upload_id = emalloc(strlen(*e_data->value) + 1); -- strcpy(*upload_id, *e_data->value); -- -- progress->upload_id = *upload_id; -+ progress->upload_id = emalloc(strlen(*e_data->value) + 1); -+ strcpy(progress->upload_id, *e_data->value); - progress->time_last = time(NULL); - progress->speed_average = 0; - progress->speed_last = 0; - progress->bytes_uploaded = read_bytes; - progress->files_uploaded = 0; - progress->est_sec = 0; -- progress->identifier = uploadprogress_mk_filename(*upload_id, template); -+ progress->identifier = uploadprogress_mk_filename(progress->upload_id, template); - progress->identifier_tmp = emalloc(strlen( progress->identifier) + 4); - sprintf(progress->identifier_tmp, "%s.wr", progress->identifier); -- -- if (upload_id) { -- efree(upload_id); -- } - } - } - -@@ -198,6 +191,7 @@ static int uploadprogress_php_rfc1867_file(unsigned int event, void *event_data - } - } else if (event == MULTIPART_EVENT_END) { - VCWD_UNLINK(progress->identifier); -+ efree(progress->upload_id); - efree(progress->identifier); - efree(progress->identifier_tmp); - efree(progress); -@@ -264,6 +258,10 @@ static int uploadprogress_php_rfc1867_file(unsigned int event, void *event_data - efree(progress->identifier); - } - -+ if (progress->upload_id) { -+ efree(progress->upload_id); -+ } -+ - if (progress->identifier_tmp) { - efree(progress->identifier_tmp); - } -- cgit