[arch-commits] Commit in syslinux/trunk (PKGBUILD fix_infinite_loop_tests.patch)

[Anatol Pomozov]

    Date: Saturday, January 20, 2018 @ 22:05:31
  Author: anatolik
Revision: 315186

Fix infinite loop in load_linux test

Added:
  syslinux/trunk/fix_infinite_loop_tests.patch
Modified:
  syslinux/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |    7 ++++++-
 fix_infinite_loop_tests.patch |   16 ++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-20 21:55:09 UTC (rev 315185)
+++ PKGBUILD	2018-01-20 22:05:31 UTC (rev 315186)
@@ -38,6 +38,7 @@
         correct_base_type.patch::http://repo.or.cz/syslinux.git/patch/83aad4f
         set_mode_base.patch::http://repo.or.cz/syslinux.git/patch/0a2dbb3
         fix_return_pointer.patch::http://repo.or.cz/syslinux.git/patch/8dc6d758b564a1ccc44c3ae11f265d43628219ce
+        fix_infinite_loop_tests.patch
 )
 sha1sums=('SKIP'
           '1145f454bd297d373ad123425f93620c3e92f585'
@@ -48,7 +49,8 @@
           'f50e0a92c65536ef73a84614d489e52d9d1db329'
           'e24bf5b1617bab4a3f46925c5a8ee6079f4686bf'
           '500c174fce91133d40024b28f6f5cedb144b84c2'
-          'b3d2196aaec154749c5b796c6d9bfd605a918cf8')
+          'b3d2196aaec154749c5b796c6d9bfd605a918cf8'
+          '7ecb02550666dfafeb0b22a67dcc34caa4b79767')
 
 _targets='bios efi32'
 case "$CARCH" in
@@ -75,6 +77,9 @@
   # FS#49250
   patch -p1 < ../fix_return_pointer.patch
 
+  # fix infinite loop in load_linux
+  patch -p1 < ../fix_infinite_loop_tests.patch
+
   # do not swallow efi compilation output to make debugging easier
   sed 's|> /dev/null 2>&1||' -i efi/check-gnu-efi.sh
 

Added: fix_infinite_loop_tests.patch
===================================================================
--- fix_infinite_loop_tests.patch	                        (rev 0)
+++ fix_infinite_loop_tests.patch	2018-01-20 22:05:31 UTC (rev 315186)
@@ -0,0 +1,16 @@
+diff --git a/com32/lib/syslinux/tests/load_linux.c b/com32/lib/syslinux/tests/load_linux.c
+index ed973841..751b8b24 100644
+--- a/com32/lib/syslinux/tests/load_linux.c
++++ b/com32/lib/syslinux/tests/load_linux.c
+@@ -38,8 +38,10 @@ int syslinux_shuffle_boot_rm(struct syslinux_movelist *fraglist,
+     while (ml) {
+ 	addr_t cmdline_addr, last_lowmem_addr;
+ 
+-	if (ml->src != __test_cmdline)
++	if (ml->src != __test_cmdline) {
++	    ml = ml->next;
+ 	    continue;
++	}
+ 
+ 	last_lowmem_addr = __test_cmdline_addr;
+ 	cmdline_addr = ml->dst;