Skip to content

Resolve strdup memory leak with GetPathBaseName #1106

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
SmoothHacker wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Resolve strdup memory leak with GetPathBaseName #1106

Show file tree
Hide file tree
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
7 changes: 3 additions & 4 deletions core/debugadapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@ limitations under the License.

#include <binaryninjacore.h>
#include <binaryninjaapi.h>
#include <filesystem>
#include <lowlevelilinstruction.h>
#include <mediumlevelilinstruction.h>
#include <highlevelilinstruction.h>
#ifndef WIN32
#include "libgen.h"
#endif
#include "debugadapter.h"
#include "debuggercontroller.h"

Expand Down Expand Up @@ -80,7 +78,8 @@ std::string DebugModule::GetPathBaseName(const std::string& path)
_splitpath_s(path.c_str(), NULL, 0, NULL, 0, baseName, MAX_PATH, ext, MAX_PATH);
return std::string(baseName) + std::string(ext);
#else
return basename(strdup(path.c_str()));
std::filesystem::path fs_path(path);
return fs_path.stem();
#endif
}

Expand Down
10 changes: 6 additions & 4 deletions core/debuggercommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ limitations under the License.
*/

#pragma once
#include <cstdint>
#include <filesystem>
#include <string.h>
#include <optional>
#ifndef WIN32
#include "libgen.h"
#endif
#include <string>
#include <vector>

namespace BinaryNinjaDebugger {
struct ModuleNameAndOffset
Expand Down Expand Up @@ -63,7 +64,8 @@ namespace BinaryNinjaDebugger {
_splitpath_s(path.c_str(), NULL, 0, NULL, 0, baseName, MAX_PATH, ext, MAX_PATH);
return std::string(baseName) + std::string(ext);
#else
return basename(strdup(path.c_str()));
std::filesystem::path fs_path(path);
return fs_path.stem();
#endif
}

Expand Down