emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loadfont: 32k size limit is not enough

Browse Source 
Since our "read to malloced buf" routines only gradually grow
allocations, let's be generous here and allow 128k.

Reported by Alex Henrie <alexhenrie24@gmail.com>

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-11-03 20:57:37 +01:00
parent 1ab7c2fc6d
commit 2b288236e8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
console-tools/loadfont.c
View File

@ -319,8 +319,10 @@ int loadfont_main(int argc UNUSED_PARAM, char **argv)
* We used to look at the length of the input file
* with stat(); now that we accept compressed files,
* just read the entire file.
* Len was 32k, but latarcyrheb-sun32.psfu is 34377 bytes
* (it has largish Unicode map).
*/
len = 32*1024; // can't be larger
len = 128*1024;
buffer = xmalloc_read(STDIN_FILENO, &len);
// xmalloc_open_zipped_read_close(filename, &len);
if (!buffer)
@ -405,7 +407,7 @@ int setfont_main(int argc UNUSED_PARAM, char **argv)
}
}
// load font
len = 32*1024; // can't be larger
len = 128*1024;
buffer = xmalloc_open_zipped_read_close(*argv, &len);
if (!buffer)
bb_simple_perror_msg_and_die(*argv);