[syslinux:master] setup_data: if nothing to load and version < 2. 09, no harm no foul

[syslinux-bot for H. Peter Anvin]

Commit-ID:  fda6eb8480b797475f228325233c4f4931904bef
Gitweb:     http://www.syslinux.org/commit/fda6eb8480b797475f228325233c4f4931904bef
Author:     H. Peter Anvin <hpa at linux.intel.com>
AuthorDate: Fri, 29 Jun 2012 15:46:27 -0700
Committer:  H. Peter Anvin <hpa at linux.intel.com>
CommitDate: Fri, 29 Jun 2012 15:46:27 -0700

setup_data: if nothing to load and version < 2.09, no harm no foul

If the setup_data is empty, it is okay if the version is < 2.09.

Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>

---
 com32/lib/syslinux/load_linux.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/com32/lib/syslinux/load_linux.c b/com32/lib/syslinux/load_linux.c
index 622c2ab..856141f 100644
--- a/com32/lib/syslinux/load_linux.c
+++ b/com32/lib/syslinux/load_linux.c
@@ -462,15 +462,15 @@ int syslinux_boot_linux(void *kernel_buf, size_t kernel_size,
 	    addr_t best_addr = 0;
 	    size_t size = sdp->hdr.len + sizeof(sdp->hdr);
 
+	    if (!sdp->data || !sdp->hdr.len)
+		continue;
+
 	    if (hdr.version < 0x0209) {
 		/* Setup data not supported */
 		errno = ENXIO;	/* Kind of arbitrary... */
 		goto bail;
 	    }
 
-	    if (!sdp->data || !sdp->hdr.len)
-		continue;
-
 	    for (ml = amap; ml->type != SMT_END; ml = ml->next) {
 		addr_t adj_start = (ml->start + align_mask) & ~align_mask;
 		addr_t adj_end = ml->next->start & ~align_mask;