virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

ffprobe: use safer type for index variable in value_string()

Browse Source 
There is no guarantee that the casted double which is assigned to the
variable will be contained in an int (also if it is almost sure for most
non-alien architectures).
This commit is contained in:
Stefano Sabatini 2012-01-18 00:22:17 +01:00
parent 54661219c1
commit 2c8d37c2fb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ffprobe.c
View File

@ -104,15 +104,16 @@ static char *value_string(char *buf, int buf_size, struct unit_value uv)
snprintf(buf, buf_size, "%d:%02d:%09.6f", hours, mins, secs); snprintf(buf, buf_size, "%d:%02d:%09.6f", hours, mins, secs);
} else if (use_value_prefix) { } else if (use_value_prefix) {
const char *prefix_string; const char *prefix_string;
int index, l; long long int index;
int l;
if (uv.unit == unit_byte_str && use_byte_value_binary_prefix) { if (uv.unit == unit_byte_str && use_byte_value_binary_prefix) {
index = (int) (log(vald)/log(2)) / 10; index = (long long int) (log(vald)/log(2)) / 10;
index = av_clip(index, 0, FF_ARRAY_ELEMS(binary_unit_prefixes) -1); index = av_clip(index, 0, FF_ARRAY_ELEMS(binary_unit_prefixes) -1);
vald /= pow(2, index*10); vald /= pow(2, index*10);
prefix_string = binary_unit_prefixes[index]; prefix_string = binary_unit_prefixes[index];
} else { } else {
index = (int) (log10(vald)) / 3; index = (long long int) (log10(vald)) / 3;
index = av_clip(index, 0, FF_ARRAY_ELEMS(decimal_unit_prefixes) -1); index = av_clip(index, 0, FF_ARRAY_ELEMS(decimal_unit_prefixes) -1);
vald /= pow(10, index*3); vald /= pow(10, index*3);
prefix_string = decimal_unit_prefixes[index]; prefix_string = decimal_unit_prefixes[index];