[git commit] loadfont: 32k size limit is not enough

Denys Vlasenko vda.linux at googlemail.com
Thu Nov 3 19:57:37 UTC 2016


commit: https://git.busybox.net/busybox/commit/?id=2b288236e80938d29324072a823f46861bd07cd3
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

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

Reported by Alex Henrie <alexhenrie24 at gmail.com>

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 console-tools/loadfont.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 032506d..58073e0 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -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);


More information about the busybox-cvs mailing list