Changeset 4083c49 for zephyr.c

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>

File:

• zephyr.c (modified) (2 diffs)

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("*");