libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 17:57:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some memory leaks caused by never freeing the allocated memory, which is pointed at by KernelFuncWithSignature::signature.

Browse Source 
svn-id: r47275
This commit is contained in:
Johannes Schickel 2010-01-12 20:19:45 +00:00
parent 36444740b3
commit 3578f8d091
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/sci/engine/kernel.cpp
View File

@ -392,11 +392,17 @@ Kernel::Kernel(ResourceManager *resMan, Common::String gameId) : _resMan(resMan)
}
Kernel::~Kernel() {
for (KernelFuncsContainer::iterator i = _kernelFuncs.begin(); i != _kernelFuncs.end(); ++i)
// TODO: Doing a const_cast is not that nice actually... But since KernelFuncWithSignature
// keeps the signature member as "const char *" there is no way around it.
// Think of a clever way to avoid this.
free(const_cast<char *>(i->signature));
}
uint Kernel::getSelectorNamesSize() const {
return _selectorNames.size();
}
const Common::String &Kernel::getSelectorName(uint selector) const {
return _selectorNames[selector];
}
@ -404,6 +410,7 @@ const Common::String &Kernel::getSelectorName(uint selector) const {
uint Kernel::getKernelNamesSize() const {
return _kernelNames.size();
}
const Common::String &Kernel::getKernelName(uint number) const {
// FIXME: The following check is a temporary workaround for
// an issue leading to crashes when using the debugger's backtrace
@ -504,7 +511,7 @@ static void kernel_compile_signature(const char **s) {
if (!src)
return; // NULL signature: Nothing to do
result = (char*)malloc(strlen(*s) + 1);
result = (char *)malloc(strlen(*s) + 1);
while (*src) {
char c;
@ -554,11 +561,10 @@ static void kernel_compile_signature(const char **s) {
ellipsis = 1;
break;
default: {
default:
error("INTERNAL ERROR when compiling kernel function signature '%s': (%02x) not understood (aka"
" '%c')\n", *s, c, c);
}
}
} while (*src && (*src == KSIG_SPEC_ELLIPSIS || (c < 'a' && c != KSIG_SPEC_ANY)));
// To handle sum types

3
engines/sci/engine/kernel.h
View File

@ -84,7 +84,8 @@ public:
void dumpScriptClass(char *data, int seeker, int objsize);
SelectorCache _selectorCache; /**< Shortcut list for important selectors */
Common::Array<KernelFuncWithSignature> _kernelFuncs; /**< Table of kernel functions */
typedef Common::Array<KernelFuncWithSignature> KernelFuncsContainer;
KernelFuncsContainer _kernelFuncs; /**< Table of kernel functions */
private:
/**