FS-11183 improve strip to save out buffer size

src/switch_utils.c

@@ -1405,12 +1405,12 @@ SWITCH_DECLARE(char *) switch_strip_commas(char *in, char *out, switch_size_t le
 	for (; p && *p; p++) {
 		if ((*p > 47 && *p < 58)) {
 			*q++ = *p;
-		} else if (*p != ',') {
+
+			if (++x > len) {
 				ret = NULL;
 				break;
 			}
-
-		if (++x > len) {
+		} else if (*p != ',') {
 			ret = NULL;
 			break;
 		}
@@ -1428,13 +1428,13 @@ SWITCH_DECLARE(char *) switch_strip_nonnumerics(char *in, char *out, switch_size
 	for (; p && *p; p++) {
 		if ((*p > 47 && *p < 58) || *p == '.' || *p == '-' || *p == '+') {
 			*q++ = *p;
-		}
 
 			if (++x > len) {
 				ret = NULL;
 				break;
 			}
 		}
+	}
 
 	return ret;
 }