ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Parse information from harvid independent from the locale

Browse Source 
This fixes a crash where aspect ratio "0.5" from harvid was interpreted
as "0" in the French locale (expecting 0,5).

Note: harvid uses a portable, not localized snprintf() implementation
This commit is contained in:
Robin Gareus 2016-08-22 14:47:19 +02:00
parent 36f232d558
commit 444b9e8903
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/utils_videotl.cc
View File

@ -260,6 +260,7 @@ VideoUtils::video_query_info (
double &video_aspect_ratio
)
{
LocaleGuard lg;
char url[2048];
snprintf(url, sizeof(url), "%s%sinfo/?file=%s&format=csv"
@ -282,6 +283,12 @@ VideoUtils::video_query_info (
video_aspect_ratio = atof (lines.at(0).at(3));
video_file_fps = atof (lines.at(0).at(4));
video_duration = atoll(lines.at(0).at(5));
if (video_aspect_ratio < 0.01 || video_file_fps < 0.01) {
/* catch errors early, aspect == 0 or fps == 0 will
* wreak havoc down the road */
return false;
}
return true;
}