diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-06-09 10:19:25 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-06-09 10:19:25 -0700 |
| commit | 38e1c74db64e02152e525c2d5c135cb5793d847e (patch) | |
| tree | fb29cd98f688064675882a35040414bfaf865afc /core | |
| parent | 1869311343efb546ea0a5a47cda7572d863a029a (diff) | |
| download | syslinux-38e1c74db64e02152e525c2d5c135cb5793d847e.tar.gz | |
pxelinux: actually stop parsing on a null optionsyslinux-3.82
Stop the OACK parsing on a null option, even if it isn't the very
first option.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/pxelinux.asm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/pxelinux.asm b/core/pxelinux.asm index 0e65e073..58201a0b 100644 --- a/core/pxelinux.asm +++ b/core/pxelinux.asm @@ -1105,6 +1105,8 @@ searchdir: ; SI -> first byte of options; [E]CX -> byte count .parse_oack: jcxz .done_pkt ; No options acked + +.get_opt_name: ; If we find an option which starts with a NUL byte, ; (a null option), we're either seeing garbage that some ; TFTP servers add to the end of the packet, or we have @@ -1114,7 +1116,6 @@ searchdir: cmp byte [si],0 je .done_pkt -.get_opt_name: mov di,si mov bx,si .opt_name_loop: lodsb |