Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffprobe: add more safe casts in value_string()

Browse Source 
Second attempt at fixing ticket #921.
release/0.10
Stefano Sabatini 13 years ago
parent 2c8d37c2fb
commit 140a9afcf2
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      ffprobe.c

6
ffprobe.c
Unescape View File

@ -119,15 +119,15 @@ static char *value_string(char *buf, int buf_size, struct unit_value uv)
prefix_string = decimal_unit_prefixes[index]; prefix_string = decimal_unit_prefixes[index];
} }
if (show_float || vald != (int)vald) l = snprintf(buf, buf_size, "%.3f", vald); if (show_float || vald != (long long int)vald) l = snprintf(buf, buf_size, "%.3f", vald);
else l = snprintf(buf, buf_size, "%lld", (long long int)vald); else l = snprintf(buf, buf_size, "%lld", (long long int)vald);
snprintf(buf+l, buf_size-l, "%s%s%s", prefix_string || show_value_unit ? " " : "", snprintf(buf+l, buf_size-l, "%s%s%s", prefix_string || show_value_unit ? " " : "",
prefix_string, show_value_unit ? uv.unit : ""); prefix_string, show_value_unit ? uv.unit : "");
} else { } else {
int l; int l;
if (show_float) l = snprintf(buf, buf_size, "%.3f", vald); if (show_float) l = snprintf(buf, buf_size, "%.3f", vald);
else l = snprintf(buf, buf_size, "%d", (int)vald); else l = snprintf(buf, buf_size, "%lld", (long long int)vald);
snprintf(buf+l, buf_size-l, "%s%s", show_value_unit ? " " : "", snprintf(buf+l, buf_size-l, "%s%s", show_value_unit ? " " : "",
show_value_unit ? uv.unit : ""); show_value_unit ? uv.unit : "");
} }

Write Preview
Loading…
Cancel
Save