From cb164b1d115cb848abfba934d44a4d41ff84c6fe Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 9 Aug 2015 13:12:35 +0100 Subject: cppcheck: arrayIndexThenCheck Change-Id: I66dc4dd095d4e1a9d963b1c2c6a99b16d9f9bf61 --- onlineupdate/source/libmar/sign/nss_secutil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'onlineupdate/source/libmar') diff --git a/onlineupdate/source/libmar/sign/nss_secutil.c b/onlineupdate/source/libmar/sign/nss_secutil.c index ac8954ceb953..01aa5734e0a2 100644 --- a/onlineupdate/source/libmar/sign/nss_secutil.c +++ b/onlineupdate/source/libmar/sign/nss_secutil.c @@ -158,7 +158,7 @@ SECU_FilePasswd(PK11SlotInfo *slot, PRBool retry, void *arg) int phraseLen; /* handle the Windows EOL case */ - while (phrases[i] != '\r' && phrases[i] != '\n' && i < nb) i++; + while (i < nb && phrases[i] != '\r' && phrases[i] != '\n') i++; /* terminate passphrase */ phrases[i++] = '\0'; /* clean up any EOL before the start of the next passphrase */ -- cgit