generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc/ass_split: check for NULL pointer in ff_ass_split_override_codes().

Browse Source 
This is consistent with the other ff_ass_split_* functions.

It also fixes a crash when trying to split a dialog with text=NULL
(which seems to happen when the text of the dialog is empty); basically,
this commit fixes crashes when trying to encode an empty text subtitle
dialog (see subrip and mov_text encoders).

Fixes Ticket2048.
(cherry picked from commit c83002a4f8042ccfa0688a9a18e8fa0369c1fda8)
This commit is contained in:
Clément Bœsch 2012-12-30 06:53:48 +01:00 committed by Carl Eugen Hoyos
parent 5f0e5b4048
commit 8bc0127b3d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ass_split.c
View File

@ -366,7 +366,7 @@ int ff_ass_split_override_codes(const ASSCodesCallbacks *callbacks, void *priv,
char new_line[2]; char new_line[2];
int text_len = 0; int text_len = 0;
while (*buf) { while (buf && *buf) {
if (text && callbacks->text && if (text && callbacks->text &&
(sscanf(buf, "\\%1[nN]", new_line) == 1 || (sscanf(buf, "\\%1[nN]", new_line) == 1 ||
!strncmp(buf, "{\\", 2))) { !strncmp(buf, "{\\", 2))) {