Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #612 from winterheart/memory-leaks-2

Browse Source 
Fix discovered memory leaks
This commit is contained in:
Louis Gombert 2024-10-04 19:44:55 +02:00 committed by GitHub
commit 9312711856
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
linux/lnxdata.cpp
View File

@ -42,8 +42,9 @@
*/
#include <cstring>
#include <cstdio>
#include <sys/types.h>
#include <filesystem>
#include <SDL.h>
#if defined(POSIX)
#include <unistd.h>
@ -53,11 +54,8 @@
#include <Lmcons.h>
#endif
#include <SDL.h>
#include "appdatabase.h"
#include "linux/lnxdatabase.h"
#include "pserror.h"
#include "log.h"
#include "pserror.h"
#include "registry.h"
@ -70,20 +68,17 @@ oeLnxAppDatabase::oeLnxAppDatabase() {
// Open up the database file, for reading, read in all data and keep it in memory
// then close the database
char const* prefPath = SDL_GetPrefPath("Outrage Entertainment", "Descent 3");
if (prefPath == NULL) {
fprintf(stderr, "ERROR: Couldn't find preference directory!\n");
const char* prefPath = SDL_GetPrefPath("Outrage Entertainment", "Descent 3");
if (prefPath == nullptr) {
LOG_FATAL << "Couldn't find preference directory!";
exit(43);
}
std::filesystem::path fileName = std::filesystem::path(prefPath) / REGISTRY_FILENAME;
SDL_free((void *)prefPath);
const size_t fileLen = strlen(prefPath) + strlen(REGISTRY_FILENAME) + 2;
char* fileName = new char[fileLen];
snprintf(fileName, fileLen, "%s/%s", prefPath, REGISTRY_FILENAME);
database = new CRegistry(fileName);
database = new CRegistry(fileName.u8string().c_str());
database->Import();
create_record("Version");
delete [] fileName;
}
oeLnxAppDatabase::oeLnxAppDatabase(oeLnxAppDatabase *parent) {

1
renderer/HardwareOpenGL.cpp
View File

@ -1277,6 +1277,7 @@ void rend_Close() {
return;
opengl_Close();
SDL_GL_UnloadLibrary();
Renderer_initted = 0;
}