jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

efivar: allocate enough memory in makeguids tool

Browse Source 
Without execution (sometimes) fail:

./makeguids guids.txt guids.bin names.bin guid-symbols.S efivar-guids.h
makeguids: malloc.c:2395: sysmalloc: Assertion `(old_top == initial_top (av) && old_size == 0) || ((unsigned long) (old_size) >= MINSIZE && prev_inuse (old_top) && ((unsigned long) old_end & (pagesize - 1)) == 0)' failed.
This commit is contained in:
Peter Vicman 2016-05-05 20:43:37 +02:00
parent cdcc907dff
commit 236cfbe5c7
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-makeguids-allocate-fix.patch Normal file
View File

@ -0,0 +1,32 @@
fix for
./makeguids guids.txt guids.bin names.bin guid-symbols.S efivar-guids.h
makeguids: malloc.c:2395: sysmalloc: Assertion `(old_top == initial_top (av) && old_size == 0) || ((unsigned long) (old_size) >= MINSIZE && prev_inuse (old_top) && ((unsigned long) old_end & (pagesize - 1)) == 0)' failed.
--- a/src/makeguids.c 2014-10-15 06:48:49.000000000 -0700
+++ b/src/makeguids.c 2016-05-05 05:40:35.964612900 -0700
@@ -99,10 +99,8 @@
if (rc < 0)
err(1, "makeguids: could not read \"%s\"", argv[1]);
- /* strictly speaking, this *has* to be too large. */
- struct guidname *outbuf = calloc(inlen, sizeof (char));
- if (!outbuf)
- err(1, "makeguids");
+ /* reallocate later to required size */
+ struct guidname *outbuf = NULL;
char *guidstr = inbuf;
unsigned int line;
@@ -133,6 +131,11 @@
err(1, "makeguids: \"%s\": 4 invalid data on line %d",
argv[1], line);
+ outbuf = realloc(outbuf, line * sizeof (struct guidname));
+ if (!outbuf)
+ err(1, "makeguids");
+
+ bzero(&outbuf[line-1], sizeof (struct guidname));
memcpy(&outbuf[line-1].guid, &guid, sizeof(guid));
strcpy(outbuf[line-1].symbol, "efi_guid_");
strncat(outbuf[line-1].symbol, symbol,