jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

64tass: actually add the patch

Browse source
This commit is contained in:
Jürgen Buchmüller 2020-04-22 21:53:43 +02:00
parent 1790b63c40
commit 0fbb0cc794
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
srcpkgs/64tass/patches/fix-lines-limit.patch Normal file
View file

@ -0,0 +1,25 @@
--- file.c 2020-04-07 21:18:24.000000000 +0200
+++ file.c 2020-04-22 20:11:45.714713362 +0200
@@ -493,7 +493,8 @@
tmp->data = (uint8_t *)malloc(len2);
if (tmp->data != NULL) tmp->len = len2;
max_lines = (len2 / 20 + 1024) & ~(size_t)1023;
- if (max_lines > SIZE_MAX / sizeof *tmp->line) max_lines = SIZE_MAX / sizeof *tmp->line; /* overflow */
+ if (max_lines >= INT32_MAX / sizeof *tmp->line)
+ max_lines = (INT32_MAX - 1) / sizeof *tmp->line; /* overflow */
tmp->line = (size_t *)malloc(max_lines * sizeof *tmp->line);
if (tmp->line == NULL) max_lines = 0;
}
@@ -718,8 +719,11 @@
last_ubuff = ubuff;
tmp->lines = lines;
if (lines != max_lines) {
+ if (lines >= INT32_MAX / sizeof *tmp->line)
+ lines = (INT32_MAX - 1) / sizeof *tmp->line; /* overflow */
size_t *d = (size_t *)realloc(tmp->line, lines * sizeof *tmp->line);
- if (lines == 0 || d != NULL) tmp->line = d;
+ if (lines == 0 || d != NULL)
+ tmp->line = d;
}
}
tmp->len = fp;