Attachment 596063 Details for Bug 727445 – Patch from CentOS

[patch] Patch from CentOS

tcp_wrappers-7.6-fix-xgets-infinite-loop.patch (text/plain), 1.22 KB, created by Bryan Mason on 2012-07-03 18:13:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryan Mason

Created: 2012-07-03 18:13:56 UTC

Size: 1.22 KB

patch

obsolete

>--- tcp_wrappers_7.6/misc.c.fix-xgets-infinite-loop	2012-04-22 07:51:40.000000000 +0900
>+++ tcp_wrappers_7.6/misc.c	2012-04-22 07:59:38.000000000 +0900
>@@ -32,20 +32,32 @@
> {
>     int     got;
>     char   *start = ptr;
>+    int     c, last;
> 
>     while (fgets(ptr, len, fp)) {
> 	got = strlen(ptr);
>-	if (got >= 1 && ptr[got - 1] == '\n') {
>-	    tcpd_context.line++;
>-	    if (got >= 2 && ptr[got - 2] == '\\') {
>-		got -= 2;
>-	    } else {
>-		return (start);
>-	    }
>-	}
>-	ptr += got;
>-	len -= got;
>-	ptr[0] = 0;
>+        if (got >= 1 && ptr[got - 1] == '\n') {
>+            tcpd_context.line++;
>+            if (got >= 2 && ptr[got - 2] == '\\') {
>+                got -= 2;
>+            } else {
>+                return (start);
>+            }
>+            ptr += got;
>+            len -= got;
>+            ptr[0] = 0;
>+        } else {
>+            /* over buffer len */
>+            last = (got >= 1) ? ptr[got - 1] : '\0';
>+            while ((c = fgetc(fp)) != EOF) {
>+                if (c == '\n') {
>+                    tcpd_context.line++;
>+                    if (last != '\\')
>+                        return (start);
>+                }
>+                last = c;
>+            }
>+        }
>     }
>     return (ptr > start ? start : 0);
> }

Actions: View | Diff

Attachments on bug 727445: 516268 | 593569 | 596063