ffprobe: Consider the chosen separator when doing CSV escaping

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
12 years ago · dde8068856
parent dd83028374
commit dde8068856
1 changed files with 2 additions and 1 deletions
--- a/ffprobe.c
+++ b/ffprobe.c
@ -567,7 +567,8 @@ static const char *c_escape_str(AVBPrint *dst, const char *src, const char sep,
 */
 static const char *csv_escape_str(AVBPrint *dst, const char *src, const char sep, void *log_ctx)
 {
-    int needs_quoting = !!src[strcspn(src, "\",\n\r")];
+    char meta_chars[] = { sep, '"', '\n', '\r', '\0' };
+    int needs_quoting = !!src[strcspn(src, meta_chars)];

    if (needs_quoting)
        av_bprint_chars(dst, '\"', 1);