- Began upgrade to 0.17.3, NFY

[packages/busybox.git] / busybox-loadfont.patch

diff --git a/busybox-loadfont.patch b/busybox-loadfont.patch
index 666d7a4924156a4d1c97af79d06cfcd415baa90d..1c2ef4857084fc14bb5cfa01724181ebc81c0242 100644 (file)
--- a/busybox-loadfont.patch
+++ b/busybox-loadfont.patch
@@ -1,13 +1,12 @@
---- busybox-1.12.2/console-tools/loadfont.c~   2008-11-19 12:27:34.314700966 +0100
-+++ busybox-1.12.2/console-tools/loadfont.c    2008-11-19 12:28:35.598028789 +0100
-@@ -115,8 +115,10 @@
-               head0 = sizeof(struct psf_header);
+--- busybox-1.17.3/console-tools/loadfont.c.orig       2010-10-09 22:57:13.000000000 +0300
++++ busybox-1.17.3/console-tools/loadfont.c    2010-11-08 21:30:00.827185361 +0200
+@@ -274,9 +274,6 @@
+       table = font + fontsize * charsize;
+       buffer += len;
  
-               head = head0 + fontsize * unit;
-+              /*
-               if (head > len || (!hastable && head != len))
-                       bb_error_msg_and_die("input file: bad length");
-+              */
-       } else {
-               /* file with three code pages? */
-               if (len == 9780) {
+-      if (table > buffer || (!has_table && table != buffer))
+-              bb_error_msg_and_die("input file: bad length");
+-
+       do_loadfont(fd, font, height, width, charsize, fontsize);
+ 
+       if (has_table)