Blame SOURCES/cracklib-2.9.6-lookup.patch
|
|
017226 |
diff -up cracklib-2.9.6/lib/packlib.c.lookup cracklib-2.9.6/lib/packlib.c
|
|
|
017226 |
--- cracklib-2.9.6/lib/packlib.c.lookup 2018-10-10 14:19:06.988958835 +0200
|
|
|
017226 |
+++ cracklib-2.9.6/lib/packlib.c 2018-11-26 16:04:34.648256614 +0100
|
|
|
017226 |
@@ -585,12 +585,11 @@ fprintf(stderr, "look for (%s)\n", strin
|
|
|
017226 |
fprintf(stderr, "---- %lu, %lu ----\n", lwm, hwm);
|
|
|
017226 |
#endif
|
|
|
017226 |
|
|
|
017226 |
- middle = lwm + ((hwm - lwm + 1) / 2);
|
|
|
017226 |
-
|
|
|
017226 |
for (;;)
|
|
|
017226 |
{
|
|
|
017226 |
int cmp;
|
|
|
017226 |
|
|
|
017226 |
+ middle = lwm + ((hwm - lwm + 1) / 2);
|
|
|
017226 |
|
|
|
017226 |
#if DEBUG
|
|
|
017226 |
fprintf(stderr, "lwm = %lu, middle = %lu, hwm = %lu\n", lwm, middle, hwm);
|
|
|
017226 |
@@ -617,24 +616,28 @@ fprintf(stderr, "look for (%s)\n", strin
|
|
|
017226 |
return(middle);
|
|
|
017226 |
}
|
|
|
017226 |
|
|
|
017226 |
- if (middle == hwm)
|
|
|
017226 |
- {
|
|
|
017226 |
-#if DEBUG
|
|
|
017226 |
- fprintf(stderr, "at terminal subdivision, stopping search\n");
|
|
|
017226 |
-#endif
|
|
|
017226 |
- break;
|
|
|
017226 |
- }
|
|
|
017226 |
-
|
|
|
017226 |
if (cmp < 0)
|
|
|
017226 |
{
|
|
|
017226 |
- hwm = middle;
|
|
|
017226 |
- middle = lwm + ((hwm - lwm ) / 2);
|
|
|
017226 |
- }
|
|
|
017226 |
+ if (middle == lwm)
|
|
|
017226 |
+ {
|
|
|
017226 |
+#if DEBUG
|
|
|
017226 |
+ fprintf(stderr, "at terminal subdivision from right, stopping search\n");
|
|
|
017226 |
+#endif
|
|
|
017226 |
+ break;
|
|
|
017226 |
+ }
|
|
|
017226 |
+ hwm = middle - 1;
|
|
|
017226 |
+ }
|
|
|
017226 |
else if (cmp > 0)
|
|
|
017226 |
{
|
|
|
017226 |
- lwm = middle;
|
|
|
017226 |
- middle = lwm + ((hwm - lwm + 1) / 2);
|
|
|
017226 |
- }
|
|
|
017226 |
+ if (middle == hwm)
|
|
|
017226 |
+ {
|
|
|
017226 |
+#if DEBUG
|
|
|
017226 |
+ fprintf(stderr, "at terminal subdivision from left, stopping search\n");
|
|
|
017226 |
+#endif
|
|
|
017226 |
+ break;
|
|
|
017226 |
+ }
|
|
|
017226 |
+ lwm = middle + 1;
|
|
|
017226 |
+ }
|
|
|
017226 |
}
|
|
|
017226 |
|
|
|
017226 |
return (PW_WORDS(pwp));
|