diff options
| -rw-r--r-- | subopt-helper.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/subopt-helper.c b/subopt-helper.c index 7ae5512f3d..df2ceda639 100644 --- a/subopt-helper.c +++ b/subopt-helper.c @@ -234,23 +234,14 @@ static char const * parse_str( char const * const str, strarg_t * const valp ) char const * match = strchr( str, ':' ); if ( !match ) - { - if ( str[1] != '\0' ) - { - int len = strlen( &str[1] ); - match = str + 1 + len; - } - else - { - return NULL; - } - } + match = &str[strlen(str)]; + + // empty string or too long + if ((match == str) || (match - str > 255)) + return NULL; valp->len = match - str; valp->str = str; - /* if the length is zero, indicate error */ - if ( valp->len == 0 ) { return NULL; } - return match; } |