Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 11:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't access deleted memory.

Browse Source
This commit is contained in:
Moritz Bunkus 2005-02-19 14:23:16 +00:00
parent bd20dccdc3
commit aa5c973cb1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/extract/xtr_textsubs.cpp
View File

@ -19,6 +19,7 @@
#include "common.h" #include "common.h"
#include "commonebml.h" #include "commonebml.h"
#include "matroska.h" #include "matroska.h"
#include "smart_pointers.h"
#include "xtr_textsubs.h" #include "xtr_textsubs.h"
@ -195,7 +196,7 @@ xtr_ssa_c::handle_block(KaxBlock &block,
end = start + duration / 1000000; end = start + duration / 1000000;
DataBuffer &data = block.GetBuffer(0); DataBuffer &data = block.GetBuffer(0);
s = new char[data.Size() + 1]; autofree_ptr<char> af_s(s = (char *)safemalloc(data.Size() + 1));
memcpy(s, data.Buffer(), data.Size()); memcpy(s, data.Buffer(), data.Size());
s[data.Size()] = 0; s[data.Size()] = 0;
@ -204,7 +205,6 @@ xtr_ssa_c::handle_block(KaxBlock &block,
// 0: ReadOrder, 1: Layer, 2: Style, 3: Name, 4: MarginL, 5: MarginR, // 0: ReadOrder, 1: Layer, 2: Style, 3: Name, 4: MarginL, 5: MarginR,
// 6: MarginV, 7: Effect, 8: Text // 6: MarginV, 7: Effect, 8: Text
fields = split(s, ",", 9); fields = split(s, ",", 9);
delete []s;
if (9 != fields.size()) { if (9 != fields.size()) {
mxwarn("Invalid format for a SSA line ('%s'). This entry will be " mxwarn("Invalid format for a SSA line ('%s'). This entry will be "
"skipped.\n", s); "skipped.\n", s);