- rel 5

[packages/apache1.git] / apache1-security_htpasswd_user_buffer_overflow.patch

--- build-tree/apache_1.3.34/src/support/htpasswd.c	2004-11-13 04:52:08.000000000 -0700
+++ build-tree/apache_1.3.34/src/support/htpasswd.c	2004-11-13 04:53:44.000000000 -0700
@@ -414,11 +414,11 @@
 	    return ERR_OVERFLOW;
 	}
 	strcpy(pwfilename, argv[i]);
-	if (strlen(argv[i + 1]) > (sizeof(user) - 1)) {
-	    fprintf(stderr, "%s: username too long (>%lu)\n", argv[0],
-		    (unsigned long)(sizeof(user) - 1));
-	    return ERR_OVERFLOW;
-	}
+    }
+    if (strlen(argv[i + 1]) > (sizeof(user) - 1)) {
+	fprintf(stderr, "%s: username too long (>%lu)\n", argv[0],
+		(unsigned long)(sizeof(user) - 1));
+	return ERR_OVERFLOW;
     }
     strcpy(user, argv[i + 1]);
     if ((arg = strchr(user, ':')) != NULL) {