--- camel-imap-utils.c.orig 2010-08-28 22:13:35.000000000 +1200 +++ camel-imap-utils.c 2010-08-28 22:13:40.000000000 +1200 @@ -917,6 +917,8 @@ if (g_ascii_strncasecmp (inptr, "nil", 3) != 0) { subtype = imap_parse_string (&inptr, &len); + if (inptr == NULL) + return NULL; } else { subtype = NULL; inptr += 3;