diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:34:29 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:39:44 +0200 |
| commit | 01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6 (patch) | |
| tree | 544b07f3aa41abe7907bcd2040cdad11ebc324bb /backends/vkeybd/virtual-keyboard-parser.cpp | |
| parent | 9cf2c83e5e5a35816ab153bf8443dac691829ea8 (diff) | |
| parent | a41d72a44a660c72fdadbc3a8ef580e5e03cb890 (diff) | |
| download | scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.tar.gz scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.tar.bz2 scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.zip | |
Merge branch 'master'
Diffstat (limited to 'backends/vkeybd/virtual-keyboard-parser.cpp')
| -rw-r--r-- | backends/vkeybd/virtual-keyboard-parser.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/backends/vkeybd/virtual-keyboard-parser.cpp b/backends/vkeybd/virtual-keyboard-parser.cpp index 5e4ce11fe4..58f0c468f6 100644 --- a/backends/vkeybd/virtual-keyboard-parser.cpp +++ b/backends/vkeybd/virtual-keyboard-parser.cpp @@ -205,6 +205,9 @@ bool VirtualKeyboardParser::parserCallback_event(ParserNode *node) { evt->type = VirtualKeyboard::kVKEventModifier; byte *flags = (byte*) malloc(sizeof(byte)); + if (!flags) + error("[VirtualKeyboardParser::parserCallback_event] Cannot allocate memory"); + *(flags) = parseFlags(node->values["modifiers"]); evt->data = flags; @@ -217,6 +220,9 @@ bool VirtualKeyboardParser::parserCallback_event(ParserNode *node) { evt->type = VirtualKeyboard::kVKEventSwitchMode; String& mode = node->values["mode"]; char *str = (char*) malloc(sizeof(char) * mode.size() + 1); + if (!str) + error("[VirtualKeyboardParser::parserCallback_event] Cannot allocate memory"); + memcpy(str, mode.c_str(), sizeof(char) * mode.size()); str[mode.size()] = 0; evt->data = str; |