Skip to content

Fix memory leak when loading non-existent file #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dkalinowski wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix memory leak when loading non-existent file #172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions blingfiretools/blingfiretokdll/blingfiretokdll.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

#include "blingfiretokdll.h"

#include <memory>

/*
This library provides easy interface to sentence and word-breaking functionality
which can be used in C#, Python, Perl, etc.
Expand Down Expand Up @@ -1055,8 +1057,8 @@ void* SetModelData(FAModelData * pNewModelData, const unsigned char * pImgBytes)
extern "C"
void* SetModel(const unsigned char * pImgBytes, int ModelByteCount)
{
FAModelData * pNewModelData = new FAModelData();
if (NULL == pNewModelData) {
std::unique_ptr<FAModelData> pNewModelData(new FAModelData());
if (NULL == pNewModelData.get()) {
return 0;
}

Expand All @@ -1066,7 +1068,7 @@ void* SetModel(const unsigned char * pImgBytes, int ModelByteCount)
}

// return the initialized model handle
return SetModelData(pNewModelData, pImgBytes);
return SetModelData(pNewModelData.release(), pImgBytes);
}


Expand All @@ -1077,8 +1079,8 @@ void* SetModel(const unsigned char * pImgBytes, int ModelByteCount)
extern "C"
void* LoadModel(const char * pszLdbFileName)
{
FAModelData * pNewModelData = new FAModelData();
if (NULL == pNewModelData) {
std::unique_ptr<FAModelData> pNewModelData(new FAModelData());
if (NULL == pNewModelData.get()) {
return 0;
}

Expand All @@ -1090,7 +1092,7 @@ void* LoadModel(const char * pszLdbFileName)
}

// return the initialized model handle
return SetModelData(pNewModelData, pImgBytes);
return SetModelData(pNewModelData.release(), pImgBytes);
}


Expand Down