Merge "res_ael: Fix pattern matching against literal '+'" into 13

res/ael/pval.c

@@ -760,10 +760,10 @@ static int extension_matches(pval *here, const char *exten, const char *pattern)
 				*r++ = '.';
 				*r++ = '*';
 				break;
-			case '*':
+			case '*': /* regex metacharacter */
+			case '+': /* regex metacharacter */
 				*r++ = '\\';
-				*r++ = '*';
+				/* fall through */
-				break;
 			default:
 				*r++ = *p;
 				break;
@@ -793,15 +793,10 @@ static int extension_matches(pval *here, const char *exten, const char *pattern)
 			   exten, pattern); */
 			return 1;
 		}
+	}
 
-
-	} else {
-		if ( strcmp(exten,pattern) == 0 ) {
-			return 1;
-		} else
 	return 0;
 }
-}
 
 
 static void check_expr2_input(pval *expr, char *str)