Skip to content
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

Jump to bottom

close file descriptor #248

Merged
merged 7 commits into from
Mar 28, 2023
Merged

close file descriptor #248

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7cba87e
close file descriptor
matthewkeil Mar 25, 2023
7926b2d
check fclose return value
matthewkeil Mar 27, 2023
9c78b05
move is_setup after fclose check and return early for error
matthewkeil Mar 27, 2023
1728a36
free_trusted_setup if fclose fails
matthewkeil Mar 28, 2023
62834f6
fix LoadTrustedSetup to cleanup correctly
matthewkeil Mar 28, 2023
844d54a
remove unused imports in kzg.cxx
matthewkeil Mar 28, 2023
1a6f891
use jtraglia suggestion for LoadTrustedSetup
matthewkeil Mar 28, 2023
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: 29 additions & 14 deletions bindings/node.js/src/kzg.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <iostream>
#include <sstream> // std::ostringstream
#include <algorithm> // std::copy
#include <iterator> // std::ostream_iterator
#include <string_view>
#include <napi.h>
#include "c_kzg_4844.h"
Expand Down Expand Up @@ -132,22 +129,40 @@ inline Bytes48 *get_bytes48(const Napi::Env &env, const Napi::Value &val, std::s

Napi::Value LoadTrustedSetup(const Napi::CallbackInfo& info) {
Napi::Env env = info.Env();

// Check if the trusted setup is already loaded
KzgAddonData *data = env.GetInstanceData<KzgAddonData>();
if (data->is_setup) {
Napi::Error::New(env, "kzg bindings are already setup").ThrowAsJavaScriptException();
return env.Undefined();
Napi::Error::New(env, "Error trusted setup is already loaded").ThrowAsJavaScriptException();
return env.Undefined();
}
// the validation checks for this happen in JS
const std::string file_path = info[0].As<Napi::String>().Utf8Value();

// Open the trusted setup file
std::string file_path = info[0].As<Napi::String>().Utf8Value();
FILE *file_handle = fopen(file_path.c_str(), "r");
if (file_handle == NULL) {
Napi::Error::New(env, "Error opening trusted setup file: " + file_path).ThrowAsJavaScriptException();
return env.Undefined();
if (file_handle == nullptr) {
Napi::Error::New(env, "Error opening trusted setup file: " + file_path).ThrowAsJavaScriptException();
return env.Undefined();
}
if (load_trusted_setup_file(&(data->settings), file_handle) != C_KZG_OK) {
Napi::Error::New(env, "Error loading trusted setup file: " + file_path).ThrowAsJavaScriptException();
return env.Undefined();

// Load the trusted setup from that file
C_KZG_RET ret = load_trusted_setup_file(&(data->settings), file_handle);

// Close the trusted setup file
if (fclose(file_handle) != 0) {
if (ret == C_KZG_OK) {
free_trusted_setup(&(data->settings));
}
Napi::Error::New(env, "Error closing trusted setup file").ThrowAsJavaScriptException();
return env.Undefined();
}

// Check that it was successful
if (ret != C_KZG_OK) {
Napi::Error::New(env, "Error loading trusted setup file: " + file_path).ThrowAsJavaScriptException();
return env.Undefined();
}

data->is_setup = true;
return env.Undefined();
}
Expand Down