Commit c7f19291 authored by Rafaël Carré's avatar Rafaël Carré

contrib: taglib: don't crash with strange files

Close #7036
Patch sent upstream
parent 41e20140
diff --git a/taglib/mpeg/id3v2/id3v2tag.cpp b/taglib/mpeg/id3v2/id3v2tag.cpp
index c6fe7b7..ebb1969 100644
--- a/taglib/mpeg/id3v2/id3v2tag.cpp
+++ b/taglib/mpeg/id3v2/id3v2tag.cpp
@@ -652,7 +652,9 @@ void ID3v2::Tag::parse(const ByteVector &origData)
return;
}
- Frame *frame = d->factory->createFrame(data.mid(frameDataPosition),
+ Frame *frame = NULL;
+ if (d->factory)
+ frame = d->factory->createFrame(data.mid(frameDataPosition),
&d->header);
if(!frame)
...@@ -14,6 +14,7 @@ taglib: taglib-$(TAGLIB_VERSION).tar.gz .sum-taglib ...@@ -14,6 +14,7 @@ taglib: taglib-$(TAGLIB_VERSION).tar.gz .sum-taglib
$(UNPACK) $(UNPACK)
$(APPLY) $(SRC)/taglib/taglib-static.patch $(APPLY) $(SRC)/taglib/taglib-static.patch
$(APPLY) $(SRC)/taglib/no-ansi.patch $(APPLY) $(SRC)/taglib/no-ansi.patch
$(APPLY) $(SRC)/taglib/7036.patch
ifdef HAVE_WIN32 ifdef HAVE_WIN32
$(APPLY) $(SRC)/taglib/taglib-win32.patch $(APPLY) $(SRC)/taglib/taglib-win32.patch
endif endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment