[Nmh-commits] CVS: nmh/uip sortm.c,1.6,1.7

[Glenn Burkhardt <address@hidden>]

Update of /cvsroot/nmh/nmh/uip
In directory subversions:/tmp/cvs-serv9828

Modified Files:
        sortm.c 
Log Message:
fix bug #1393, "sortm core dumps", using patch provided by
Robert Elz, address@hidden  The core dump occurred
when "Subject:" was immediately followed by an 
alphanumeric, and "-textfield subject" were used 
as arguments.


Index: sortm.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/sortm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** sortm.c     23 Aug 2002 20:37:01 -0000      1.6
--- sortm.c     30 Jun 2003 18:58:07 -0000      1.7
***************
*** 444,465 ****
            cp = subjcomp;
            cp2 = subjcomp;
!           if (strcmp (subjsort, "subject") == 0)
                while ((c = *cp)) {
                    if (! isspace(c)) {
                        if(uprf(cp, "re:"))
                            cp += 2;
!                       else {
!                           if (isalnum(c))
!                               *cp2++ = isupper(c) ? tolower(c) : c;
                            break;
-                       }
                    }
                    cp++;
                }
            while ((c = *cp++)) {
                if (isalnum(c))
                    *cp2++ = isupper(c) ? tolower(c) : c;
- 
            }
            *cp2 = '\0';
        }
--- 444,464 ----
            cp = subjcomp;
            cp2 = subjcomp;
!           if (strcmp (subjsort, "subject") == 0) {
                while ((c = *cp)) {
                    if (! isspace(c)) {
                        if(uprf(cp, "re:"))
                            cp += 2;
!                       else
                            break;
                    }
                    cp++;
                }
+           }
+ 
            while ((c = *cp++)) {
                if (isalnum(c))
                    *cp2++ = isupper(c) ? tolower(c) : c;
            }
+ 
            *cp2 = '\0';
        }