Attachment 704992 Details for Bug 917669 – patch to fix bug

[patch] patch to fix bug

Mail-Box-Parser-C-3.006-long-lines.patch (text/plain), 1.58 KB, created by Jonathan Kamens on 2013-03-04 13:57:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Kamens

Created: 2013-03-04 13:57:21 UTC

Size: 1.58 KB

patch

obsolete

>--- C.xs.orig	2004-09-22 03:31:51.000000000 -0400
>+++ C.xs	2013-03-04 08:41:08.083279924 -0500
>@@ -12,8 +12,8 @@
> #define TRACE_NOTICES   2
> #define TRACE_DEBUG     1
> 
>-#ifndef MAX_LINE
>-#define MAX_LINE        1024
>+#ifndef DFLT_LINE
>+#define DFLT_LINE        1024
> #endif
> 
> #ifndef NULL
>@@ -53,8 +53,9 @@
>     int         strip_gt;
>     int         keep_line;         /* unget line */
> 
>-    char        line[MAX_LINE+2];  /* one more for missing newline on *
>-                                    * last line of file on Windows    */
>+    char      * line;
>+    int         line_buf_size;
>+
>     long        line_start;
> } Mailbox;
> 
>@@ -78,6 +79,9 @@
>     New(0, box->filename, strlen(filename)+1, char);
>     strcpy(box->filename, filename);
> 
>+    New(0, box->line, DFLT_LINE, char);
>+    box->line_buf_size = DFLT_LINE;
>+
>     return box;
> }
> 
>@@ -144,8 +148,24 @@
>     }
> 
>     box->line_start = (long)ftell(box->file);
>-    if(!fgets(box->line, MAX_LINE, box->file))
>-        return NULL;
>+
>+    int already_read = 0;
>+    while (fgets(box->line + already_read, box->line_buf_size - already_read,
>+		 box->file))
>+      {
>+	int len = strlen(box->line);
>+	already_read += len;
>+	if (len == box->line_buf_size - 1 && box->line[len-1] != '\n') {
>+	  int new_size = box->line_buf_size * 2;
>+	  Renew(box->line, new_size, char);
>+	  box->line_buf_size = new_size;
>+	  continue;
>+	}
>+	break;
>+      }
>+
>+    if (! already_read)
>+      return NULL;
> 
>     if(box->dosmode)
>     {   int len = strlen(box->line);
>@@ -640,6 +660,7 @@
>     }
> 
>     Safefree(box->filename);
>+    Safefree(box->line);
>     Safefree(box);
> 
>

Actions: View | Diff

Attachments on bug 917669: 704992