Changeset 4083c49

Timestamp:

Aug 22, 2009, 12:49:20 AM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

303a9e1

Parents:

f4d4a00

git-author:

Anders Kaseorg <andersk@mit.edu> (08/22/09 00:18:32)

git-committer:

Anders Kaseorg <andersk@mit.edu> (08/22/09 00:49:20)

Message:

Fix unchecked accesses to s[strlen(s) - 1].

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• commands.c (modified) (1 diff)
• functions.c (modified) (1 diff)
• util.c (modified) (1 diff)
• viewwin.c (modified) (1 diff)
• zephyr.c (modified) (2 diffs)
• zwrite.c (modified) (1 diff)

commands.c

@@ -1928 +1928 @@
         myargv++;
       }
-      newbuff[strlen(newbuff)-1]='\0'; /* remove last space */
+      if (strlen(newbuff) >= 1)
+        newbuff[strlen(newbuff) - 1] = '\0'; /* remove last space */
 
       recip=owl_malloc(strlen(argv[0])+5);

functions.c

@@ -3349 +3349 @@
   }
   while (fgets(buff, LINE, file)!=NULL) {
-    if (buff[0] == '#') continue;
-    buff[strlen(buff)-1]='\0';
+    if (buff[0] == '\0' || buff[0] == '#') continue;
+    if (buff[strlen(buff) - 1] == '\n')
+      buff[strlen(buff) - 1] = '\0';
     owl_function_command(buff);
   }

util.c

@@ -595 +595 @@
     /* strip the newline */
     newline=0;
-    if (buff[strlen(buff)-1]=='\n') {
+    if (buff[0] != '\0' && buff[strlen(buff) - 1] == '\n') {
       buff[strlen(buff)-1]='\0';
       newline=1;

viewwin.c

@@ -12 +12 @@
   if (text) {
     owl_fmtext_append_normal(&(v->fmtext), text);
-    if (text[strlen(text)-1]!='\n' && text[0]!='\0') {
+    if (text[0] != '\0' && text[strlen(text) - 1] != '\n') {
       owl_fmtext_append_normal(&(v->fmtext), "\n");
     }

zephyr.c

@@ -378 +378 @@
   if (file) {
     while ( fgets(buffer, 1024, file)!=NULL ) {
-      if (buffer[0]=='#' || buffer[0]=='\n' || buffer[0]=='\n') continue;
+      if (buffer[0] == '\0' || buffer[0] == '#' || buffer[0] == '\n') continue;
       
       if (count == numSubs) {
@@ -385 +385 @@
       }
 
-      buffer[strlen(buffer)-1]='\0';
+      if (buffer[strlen(buffer) - 1] == '\n')
+        buffer[strlen(buffer) - 1] = '\0';
       subs[count].zsub_class=owl_strdup("login");
       subs[count].zsub_recipient=owl_strdup("*");

zwrite.c

@@ -188 +188 @@
         }
         pclose(file);
-        if (z->zsig[strlen(z->zsig)-1]=='\n') {
+        if (z->zsig[0] != '\0' && z->zsig[strlen(z->zsig) - 1] == '\n') {
           z->zsig[strlen(z->zsig)-1]='\0';
         }