X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=amar-src%2Famar.c;fp=amar-src%2Famar.c;h=67cc109ac7e0492df4e3931cda45fedee1640f51;hb=cd0b924f27312d57bd42f6c4fae2b795139e2d0b;hp=f6577d7d5ff35b911a086805544d802acc5e3362;hpb=011a59f5a54864108a16af570a6b287410597cc2;p=debian%2Famanda

diff --git a/amar-src/amar.c b/amar-src/amar.c
index f6577d7..67cc109 100644
--- a/amar-src/amar.c
+++ b/amar-src/amar.c
@@ -902,6 +902,22 @@ amar_read(
 		}
 
 		if (!datasize) {
+		    unsigned int i, nul_padding = 1;
+		    char *bb;
+		    /* try to detect NULL padding bytes */
+		    if (!buf_atleast(archive, &hp, 512 - RECORD_SIZE)) {
+			/* close to end of file */
+			break;
+		    }
+		    bb = buf_ptr(&hp);
+		    /* check all byte == 0 */
+		    for (i=0; i<512 - RECORD_SIZE; i++) {
+			if (*bb++ != 0)
+			    nul_padding = 0;
+		    }
+		    if (nul_padding) {
+			break;
+		    }
 		    g_set_error(error, amar_error_quark(), EINVAL,
 				"Archive file %d has an empty filename",
 				(int)filenum);