aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-01-16 13:00:32 -0500
committerH. Peter Anvin <hpa@zytor.com>2008-01-16 13:00:32 -0500
commitc6ba4eda5d49c034c3f8c5b4c5e2cf4627c68791 (patch)
treee06f148b2d46bdfa014ce0ce15ddb8aa601b96a9
parent89ce86f492c9460c96854634fc7544dd2d0e5e19 (diff)
downloadsyslinux-c6ba4eda5d49c034c3f8c5b4c5e2cf4627c68791.tar.gz
syslinux-c6ba4eda5d49c034c3f8c5b4c5e2cf4627c68791.tar.xz
syslinux-c6ba4eda5d49c034c3f8c5b4c5e2cf4627c68791.zip
EXTLINUX: correct bug when accessing an empty file; update NEWS.
Correct a bug that caused EXTLINUX to crash when accessing an empty file.
-rw-r--r--NEWS5
-rw-r--r--extlinux.asm6
2 files changed, 10 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index e3c2027c..220fc0f1 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@ Starting with 1.47, changes marked with SYSLINUX/PXELINUX/ISOLINUX
apply to that specific program only; other changes apply to all of
them.
+Changes in 3.61:
+ * EXTLINUX: fix crash when accessing an empty file.
+ * elf.c32: If a PHDR segment is present, load it.
+ * Fix SHA-1 passwords.
+
Changes in 3.60:
* Support for "auxilliary data vector", a small amount of
writable storage. Currently only supported for EXTLINUX,
diff --git a/extlinux.asm b/extlinux.asm
index a5593082..9459f568 100644
--- a/extlinux.asm
+++ b/extlinux.asm
@@ -1072,7 +1072,7 @@ searchdir:
push eax ; Save directory inode
call open_inode
- jz .done ; If error, done
+ jz .missing ; If error, done
mov cx,[si+file_mode]
shr cx,S_IFSHIFT ; Get file type
@@ -1102,6 +1102,10 @@ searchdir:
pop bx
ret
+.missing:
+ add sp,4 ; Drop directory inode
+ jmp .done
+
;
; It's a file.
;