[Scummvm-cvs-logs] scummvm master -> e70b64334d8c19b95886412409ca8ab1edc22abb
bluegr
bluegr at gmail.com
Sun Nov 23 17:04:18 CET 2014
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3fb4ab1377 COMMON: make XMLParser::loadStream() fail when stream is null
e70b64334d Merge pull request #534 from skristiansson/pr/loadstream
Commit: 3fb4ab1377d15bb0fca78c5964531d3f2d49f986
https://github.com/scummvm/scummvm/commit/3fb4ab1377d15bb0fca78c5964531d3f2d49f986
Author: Stefan Kristiansson (stefan.kristiansson at saunalahti.fi)
Date: 2014-11-22T10:02:42+02:00
Commit Message:
COMMON: make XMLParser::loadStream() fail when stream is null
Some users of this method relies on it to fail when
an invalid stream is passed to it
(E.g. VirtualKeyboard::openPack).
Changed paths:
common/xmlparser.cpp
diff --git a/common/xmlparser.cpp b/common/xmlparser.cpp
old mode 100644
new mode 100755
index c80d5e1..67a3d36
--- a/common/xmlparser.cpp
+++ b/common/xmlparser.cpp
@@ -69,7 +69,7 @@ bool XMLParser::loadBuffer(const byte *buffer, uint32 size, DisposeAfterUse::Fla
bool XMLParser::loadStream(SeekableReadStream *stream) {
_stream = stream;
_fileName = "File Stream";
- return true;
+ return _stream != nullptr;
}
void XMLParser::close() {
Commit: e70b64334d8c19b95886412409ca8ab1edc22abb
https://github.com/scummvm/scummvm/commit/e70b64334d8c19b95886412409ca8ab1edc22abb
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-11-23T18:03:28+02:00
Commit Message:
Merge pull request #534 from skristiansson/pr/loadstream
COMMON: make XMLParser::loadStream() fail when stream is null
Changed paths:
common/xmlparser.cpp
More information about the Scummvm-git-logs
mailing list