diff options
author | Stephen Kennedy | 2008-08-07 13:19:00 +0000 |
---|---|---|
committer | Stephen Kennedy | 2008-08-07 13:19:00 +0000 |
commit | 69d7c1d2ca7f569a39abcc18f24bf3a1ef47080c (patch) | |
tree | a79927c42fa1aced6b164b94f3ca9770f2928889 /backends/common/virtual-keyboard.cpp | |
parent | 72da19afef683677b6b75fd7697eb369224f7850 (diff) | |
download | scummvm-rg350-69d7c1d2ca7f569a39abcc18f24bf3a1ef47080c.tar.gz scummvm-rg350-69d7c1d2ca7f569a39abcc18f24bf3a1ef47080c.tar.bz2 scummvm-rg350-69d7c1d2ca7f569a39abcc18f24bf3a1ef47080c.zip |
* Some Valgrind fixes
* Got rid of svn:mergeinfo properties
svn-id: r33677
Diffstat (limited to 'backends/common/virtual-keyboard.cpp')
-rw-r--r-- | backends/common/virtual-keyboard.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/backends/common/virtual-keyboard.cpp b/backends/common/virtual-keyboard.cpp index c852839871..4a125bb727 100644 --- a/backends/common/virtual-keyboard.cpp +++ b/backends/common/virtual-keyboard.cpp @@ -67,7 +67,6 @@ void VirtualKeyboard::reset() { } bool VirtualKeyboard::loadKeyboardPack(Common::String packName) { - if (Common::File::exists(packName + ".xml")) { // uncompressed keyboard pack if (!_parser->loadFile(packName + ".xml")) @@ -81,7 +80,7 @@ bool VirtualKeyboard::loadKeyboardPack(Common::String packName) { unz_file_info fileInfo; unzOpenCurrentFile(zipFile); unzGetCurrentFileInfo(zipFile, &fileInfo, NULL, 0, NULL, 0, NULL, 0); - byte *buffer = new byte[fileInfo.uncompressed_size+1]; + byte *buffer = (byte *)malloc(fileInfo.uncompressed_size+1 * sizeof(byte)); assert(buffer); memset(buffer, 0, (fileInfo.uncompressed_size+1)*sizeof(byte)); unzReadCurrentFile(zipFile, buffer, fileInfo.uncompressed_size); |