Ignore:
Timestamp:
Aug 31, 2010 8:25:36 PM (11 years ago)
Author:
gah
Message:

re-merge with latest trunk changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/blt4/src/objects/RpObject.cc

    r1586 r1897  
    274274    }
    275275
    276     v = strchrnul(hint,'=');
     276    v = strchr(hint,'=');
    277277    *hintKey = hint;
    278     if ((*v == '\0') || (*(v+1) == '\0')) {
     278    if ((v == NULL) || (*v == '\0') || (*(v+1) == '\0')) {
    279279        // incomplete hint string
    280280        *hintVal = NULL;
Note: See TracChangeset for help on using the changeset viewer.