From: Unknown <>
Date: Fri, 28 Mar 2008 01:36:58 +0000 (+0000)
Subject: add files for 2008-03-28T01:36:58Z
X-Git-Tag: imap-2007b~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f59c484b371e493a97c0a56e798ba776984a9f1;p=uw-imap

add files for 2008-03-28T01:36:58Z
---

diff --git a/src/osdep/nt/unixnt.c b/src/osdep/nt/unixnt.c
index 495950e..2e92d39 100644
--- a/src/osdep/nt/unixnt.c
+++ b/src/osdep/nt/unixnt.c
@@ -21,7 +21,7 @@
  *		Internet: MRC@CAC.Washington.EDU
  *
  * Date:	20 December 1989
- * Last Edited:	20 February 2008
+ * Last Edited:	27 March 2008
  */
 
 
@@ -1522,7 +1522,7 @@ int unix_parse (MAILSTREAM *stream,char *lock,int op)
 				/* find end of keyword */
 		  if (!(u = strpbrk (s," \n\r"))) u = s + strlen (s);
 				/* got a keyword? */
-		  if ((k = (u - s)) <= MAXUSERFLAG) {
+		  if ((k = (u - s)) && (k <= MAXUSERFLAG)) {
 		    uf.data = (unsigned char *) s;
 		    uf.size = k;
 		    for (j = 0; (j < NUSERFLAGS) && stream->user_flags[j]; ++j)
@@ -1576,7 +1576,8 @@ int unix_parse (MAILSTREAM *stream,char *lock,int op)
 		      while (*s == ' ') s++;
 		      u = strpbrk (s," \n\r");
 				/* got a keyword? */
-		      if ((j < NUSERFLAGS) && ((k = (u - s)) <= MAXUSERFLAG)) {
+		      if ((j < NUSERFLAGS) && (k = (u - s)) &&
+			  (k <= MAXUSERFLAG)) {
 			if (stream->user_flags[j])
 			  fs_give ((void **) &stream->user_flags[j]);
 			stream->user_flags[j] = (char *) fs_get (k + 1);
diff --git a/src/osdep/os2/unixnt.c b/src/osdep/os2/unixnt.c
index 495950e..2e92d39 100644
--- a/src/osdep/os2/unixnt.c
+++ b/src/osdep/os2/unixnt.c
@@ -21,7 +21,7 @@
  *		Internet: MRC@CAC.Washington.EDU
  *
  * Date:	20 December 1989
- * Last Edited:	20 February 2008
+ * Last Edited:	27 March 2008
  */
 
 
@@ -1522,7 +1522,7 @@ int unix_parse (MAILSTREAM *stream,char *lock,int op)
 				/* find end of keyword */
 		  if (!(u = strpbrk (s," \n\r"))) u = s + strlen (s);
 				/* got a keyword? */
-		  if ((k = (u - s)) <= MAXUSERFLAG) {
+		  if ((k = (u - s)) && (k <= MAXUSERFLAG)) {
 		    uf.data = (unsigned char *) s;
 		    uf.size = k;
 		    for (j = 0; (j < NUSERFLAGS) && stream->user_flags[j]; ++j)
@@ -1576,7 +1576,8 @@ int unix_parse (MAILSTREAM *stream,char *lock,int op)
 		      while (*s == ' ') s++;
 		      u = strpbrk (s," \n\r");
 				/* got a keyword? */
-		      if ((j < NUSERFLAGS) && ((k = (u - s)) <= MAXUSERFLAG)) {
+		      if ((j < NUSERFLAGS) && (k = (u - s)) &&
+			  (k <= MAXUSERFLAG)) {
 			if (stream->user_flags[j])
 			  fs_give ((void **) &stream->user_flags[j]);
 			stream->user_flags[j] = (char *) fs_get (k + 1);