Commit d079d1d3 authored by Clément Bœsch's avatar Clément Bœsch

ffprobe: do not escape '"' between single quotes.

parent c1abfcd7
...@@ -642,15 +642,15 @@ static const char *csv_escape_str(AVBPrint *dst, const char *src, const char sep ...@@ -642,15 +642,15 @@ static const char *csv_escape_str(AVBPrint *dst, const char *src, const char sep
int needs_quoting = !!src[strcspn(src, meta_chars)]; int needs_quoting = !!src[strcspn(src, meta_chars)];
if (needs_quoting) if (needs_quoting)
av_bprint_chars(dst, '\"', 1); av_bprint_chars(dst, '"', 1);
for (; *src; src++) { for (; *src; src++) {
if (*src == '"') if (*src == '"')
av_bprint_chars(dst, '\"', 1); av_bprint_chars(dst, '"', 1);
av_bprint_chars(dst, *src, 1); av_bprint_chars(dst, *src, 1);
} }
if (needs_quoting) if (needs_quoting)
av_bprint_chars(dst, '\"', 1); av_bprint_chars(dst, '"', 1);
return dst->str; return dst->str;
} }
...@@ -1254,7 +1254,7 @@ static const char *xml_escape_str(AVBPrint *dst, const char *src, void *log_ctx) ...@@ -1254,7 +1254,7 @@ static const char *xml_escape_str(AVBPrint *dst, const char *src, void *log_ctx)
case '&' : av_bprintf(dst, "%s", "&"); break; case '&' : av_bprintf(dst, "%s", "&"); break;
case '<' : av_bprintf(dst, "%s", "&lt;"); break; case '<' : av_bprintf(dst, "%s", "&lt;"); break;
case '>' : av_bprintf(dst, "%s", "&gt;"); break; case '>' : av_bprintf(dst, "%s", "&gt;"); break;
case '\"': av_bprintf(dst, "%s", "&quot;"); break; case '"' : av_bprintf(dst, "%s", "&quot;"); break;
case '\'': av_bprintf(dst, "%s", "&apos;"); break; case '\'': av_bprintf(dst, "%s", "&apos;"); break;
default: av_bprint_chars(dst, *p, 1); default: av_bprint_chars(dst, *p, 1);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment