(stream_getline,parse_content_type): A couple of bugfixes.

@@ -1593,7 +1593,7 @@ stream_getline (stream_t str, char **buf, size_t *bufsize, size_t *pnum)
       numread += n;
       if ((*buf)[numread - 1] != '\n')
 	{
-	  if (numread == *bufsize)
+	  if (numread + 1 == *bufsize)
 	    {
 	      *bufsize += 128;
 	      *buf = xrealloc (*buf, *bufsize);
@@ -1663,6 +1663,7 @@ parse_content_type (struct compose_env *env,
 
   while (stop == 0 && status == 0 && *rest)
     {
+      skipws (rest);
       switch (*rest++)
 	{
 	case '(':
@@ -1742,7 +1743,6 @@ parse_content_type (struct compose_env *env,
 	  stop = 1;
 	  break;
 	}
-      skipws (rest);
     }
 
   if (comment)