Changeset af2ca19

Timestamp:

Sep 16, 2002, 6:13:41 PM (22 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

62f24bc

Parents:

42abb10

Message:

Fixed memory leak and buffer overrun in fmtext

Files:

• ChangeLog (modified) (1 diff)
• fmtext.c (modified) (3 diffs)
• message.c (modified) (1 diff)
• viewwin.c (modified) (2 diffs)

ChangeLog

@@ -5 +5 @@
         There is now a 'zlist' command that acts like 'znol -l'
         'l' is bound to 'zlist'
+        Fixed memory leak and buffer overrun in fmtext
         
 1.2.3

fmtext.c

@@ -396 +396 @@
   char *ptr1, *ptr2;
   int i, offset;
-
-  /* initialize out */
-  owl_fmtext_init_null(out);
   
   /* find the starting line */
@@ -436 +433 @@
   /* the message is expected to end in a new line for now */
 
-  owl_fmtext_init_null(out);
-
   last=in->textbuff+in->textlen-1;
   ptr1=in->textbuff;
@@ -478 +473 @@
   int lines, i;
 
+  if (f->textlen==0) return(0);
+  
   lines=0;
-  for (i=0; f->textbuff[i]!='\0'; i++) {
+  for (i=0; i<f->textlen; i++) {
     if (f->textbuff[i]=='\n') lines++;
   }

message.c

@@ -205 +205 @@
   owl_fmtext a, b;
 
+  owl_fmtext_init_null(&a);
+  owl_fmtext_init_null(&b);
+  
   owl_fmtext_truncate_lines(&(m->fmtext), aline, bline-aline+1, &a);
   owl_fmtext_truncate_cols(&a, acol, bcol, &b);

viewwin.c

@@ -55 +55 @@
   wmove(v->curswin, 0, 0);
 
+  owl_fmtext_init_null(&fm1);
+  owl_fmtext_init_null(&fm2);
+  
   owl_fmtext_truncate_lines(&(v->fmtext), v->topline, v->winlines-BOTTOM_OFFSET, &fm1);
   owl_fmtext_truncate_cols(&fm1, v->rightshift, v->wincols-1+v->rightshift, &fm2);
@@ -74 +77 @@
     doupdate();
   }
+
+  owl_fmtext_free(&fm1);
+  owl_fmtext_free(&fm2);
 }