Module Name: src
Committed By: christos
Date: Tue Mar 8 20:16:56 UTC 2016
Modified Files:
src/distrib/cdrom/macppc_installboot: cd9660_util.c
Log Message:
PR/50915: David Binderman: Fix infinite loop and printf format.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/cdrom/macppc_installboot/cd9660_util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/cdrom/macppc_installboot/cd9660_util.c
diff -u src/distrib/cdrom/macppc_installboot/cd9660_util.c:1.3 src/distrib/cdrom/macppc_installboot/cd9660_util.c:1.4
--- src/distrib/cdrom/macppc_installboot/cd9660_util.c:1.3 Sat Sep 27 11:21:40 2014
+++ src/distrib/cdrom/macppc_installboot/cd9660_util.c Tue Mar 8 15:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_util.c,v 1.3 2014/09/27 15:21:40 tsutsui Exp $ */
+/* $NetBSD: cd9660_util.c,v 1.4 2016/03/08 20:16:56 christos Exp $ */
/*-
* Copyright (c) 1994
@@ -99,7 +99,7 @@ isofncmp(const u_char *fn, size_t fnlen,
const u_char *isoend = isofn + isolen;
#ifdef DEBUG
- printf("fn = %s, fnlen = %d, isofn = %s, isolen = %d\n",
+ printf("fn = %s, fnlen = %zu, isofn = %s, isolen = %zu\n",
fn, fnlen, isofn, isolen);
#endif
@@ -119,7 +119,7 @@ isofncmp(const u_char *fn, size_t fnlen,
break;
}
fn++;
- for (i = 0; --fnlen >= 0; i = i * 10 + *fn++ - '0') {
+ for (i = 0; fnlen-- > 0; i = i * 10 + *fn++ - '0') {
if (*fn < '0' || *fn > '9') {
return -1;
}
