Skip to content

Fix memory leaks #2153

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

Merged
kunal-vaishnavi merged 3 commits into from
May 18, 2026
Merged

Fix memory leaks #2153

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bffe6f0
Fix memory leaks
skottmckay May 11, 2026
517a38f
Use RAII guard for OgaStringArray to ensure exception safety
baijumeswani May 15, 2026
e59d7ce
Fix OgaStringArray::Create signature to match C API const char* const*
baijumeswani May 15, 2026
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
43 changes: 16 additions & 27 deletions src/ort_genai.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ struct OgaString {
};

struct OgaStringArray {
std::unique_ptr<OgaStringArray> Create() {
static std::unique_ptr<OgaStringArray> Create() {
OgaStringArray* p;
OgaCheckResult(OgaCreateStringArray(&p));
return std::unique_ptr<OgaStringArray>(p);
}

std::unique_ptr<OgaStringArray> Create(const char** strings, size_t count) {
static std::unique_ptr<OgaStringArray> Create(const char* const* strings, size_t count) {
OgaStringArray* p;
OgaCheckResult(OgaCreateStringArrayFromStrings(strings, count, &p));
return std::unique_ptr<OgaStringArray>(p);
Expand Down Expand Up @@ -603,20 +603,16 @@ struct OgaTensor : OgaAbstract {
struct OgaImages : OgaAbstract {
static std::unique_ptr<OgaImages> Load(const std::vector<const char*>& image_paths) {
OgaImages* p;
OgaStringArray* strs;
OgaCheckResult(OgaCreateStringArrayFromStrings(image_paths.data(), image_paths.size(), &strs));
OgaCheckResult(OgaLoadImages(strs, &p));
OgaDestroyStringArray(strs);
auto strs = OgaStringArray::Create(image_paths.data(), image_paths.size());
OgaCheckResult(OgaLoadImages(strs.get(), &p));
return std::unique_ptr<OgaImages>(p);
}

#if OGA_USE_SPAN
static std::unique_ptr<OgaImages> Load(std::span<const char* const> image_paths) {
OgaImages* p;
OgaStringArray* strs;
OgaCheckResult(OgaCreateStringArrayFromStrings(image_paths.data(), image_paths.size(), &strs));
OgaCheckResult(OgaLoadImages(strs, &p));
OgaDestroyStringArray(strs);
auto strs = OgaStringArray::Create(image_paths.data(), image_paths.size());
OgaCheckResult(OgaLoadImages(strs.get(), &p));
return std::unique_ptr<OgaImages>(p);
}
#endif
Expand All @@ -633,20 +629,16 @@ struct OgaImages : OgaAbstract {
struct OgaAudios : OgaAbstract {
static std::unique_ptr<OgaAudios> Load(const std::vector<const char*>& audio_paths) {
OgaAudios* p;
OgaStringArray* strs;
OgaCheckResult(OgaCreateStringArrayFromStrings(audio_paths.data(), audio_paths.size(), &strs));
OgaCheckResult(OgaLoadAudios(strs, &p));
OgaDestroyStringArray(strs);
auto strs = OgaStringArray::Create(audio_paths.data(), audio_paths.size());
OgaCheckResult(OgaLoadAudios(strs.get(), &p));
return std::unique_ptr<OgaAudios>(p);
}

#if OGA_USE_SPAN
static std::unique_ptr<OgaAudios> Load(std::span<const char* const> audio_paths) {
OgaAudios* p;
OgaStringArray* strs;
OgaCheckResult(OgaCreateStringArrayFromStrings(audio_paths.data(), audio_paths.size(), &strs));
OgaCheckResult(OgaLoadAudios(strs, &p));
OgaDestroyStringArray(strs);
auto strs = OgaStringArray::Create(audio_paths.data(), audio_paths.size());
OgaCheckResult(OgaLoadAudios(strs.get(), &p));
return std::unique_ptr<OgaAudios>(p);
}
#endif
Expand Down Expand Up @@ -711,9 +703,8 @@ struct OgaMultiModalProcessor : OgaAbstract {

std::unique_ptr<OgaNamedTensors> ProcessImages(const std::vector<const char*>& prompts, const OgaImages* images = nullptr) const {
OgaNamedTensors* p;
OgaStringArray* strs;
OgaCheckResult(OgaCreateStringArrayFromStrings(prompts.data(), prompts.size(), &strs));
OgaCheckResult(OgaProcessorProcessImagesAndPrompts(this, strs, images, &p));
auto strs = OgaStringArray::Create(prompts.data(), prompts.size());
OgaCheckResult(OgaProcessorProcessImagesAndPrompts(this, strs.get(), images, &p));
return std::unique_ptr<OgaNamedTensors>(p);
}

Expand All @@ -725,9 +716,8 @@ struct OgaMultiModalProcessor : OgaAbstract {

std::unique_ptr<OgaNamedTensors> ProcessAudios(const std::vector<const char*>& prompts, const OgaAudios* audios = nullptr) const {
OgaNamedTensors* p;
OgaStringArray* strs;
OgaCheckResult(OgaCreateStringArrayFromStrings(prompts.data(), prompts.size(), &strs));
OgaCheckResult(OgaProcessorProcessAudiosAndPrompts(this, strs, audios, &p));
auto strs = OgaStringArray::Create(prompts.data(), prompts.size());
OgaCheckResult(OgaProcessorProcessAudiosAndPrompts(this, strs.get(), audios, &p));
return std::unique_ptr<OgaNamedTensors>(p);
}

Expand All @@ -739,9 +729,8 @@ struct OgaMultiModalProcessor : OgaAbstract {

std::unique_ptr<OgaNamedTensors> ProcessImagesAndAudios(const std::vector<const char*>& prompts, const OgaImages* images = nullptr, const OgaAudios* audios = nullptr) const {
OgaNamedTensors* p;
OgaStringArray* strs;
OgaCheckResult(OgaCreateStringArrayFromStrings(prompts.data(), prompts.size(), &strs));
OgaCheckResult(OgaProcessorProcessImagesAndAudiosAndPrompts(this, strs, images, audios, &p));
auto strs = OgaStringArray::Create(prompts.data(), prompts.size());
OgaCheckResult(OgaProcessorProcessImagesAndAudiosAndPrompts(this, strs.get(), images, audios, &p));
return std::unique_ptr<OgaNamedTensors>(p);
}

Expand Down
Loading