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

Fix FILE resource leak #78

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix FILE resource leak #78

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3f833f
Close FILE pointer on exception in npz_load
nmcclatchey Nov 17, 2019
d7fabcc
Close FILE pointer on exception in npy_load
nmcclatchey Nov 17, 2019
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
40 changes: 26 additions & 14 deletions cnpy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,21 @@ cnpy::npz_t cnpy::npz_load(std::string fname) {
}

cnpy::NpyArray cnpy::npz_load(std::string fname, std::string varname) {
FILE* fp = fopen(fname.c_str(),"rb");
struct AutoCloser
{
FILE * fp;
~AutoCloser (void)
{
fclose(fp);
}
} closer;
closer.fp = fopen(fname.c_str(), "rb");

if(!fp) throw std::runtime_error("npz_load: Unable to open file "+fname);
if(!closer.fp) throw std::runtime_error("npz_load: Unable to open file "+fname);

while(1) {
std::vector<char> local_header(30);
size_t header_res = fread(&local_header[0],sizeof(char),30,fp);
size_t header_res = fread(&local_header[0],sizeof(char),30,closer.fp);
if(header_res != 30)
throw std::runtime_error("npz_load: failed fread");

Expand All @@ -293,46 +301,50 @@ cnpy::NpyArray cnpy::npz_load(std::string fname, std::string varname) {
//read in the variable name
uint16_t name_len = *(uint16_t*) &local_header[26];
std::string vname(name_len,' ');
size_t vname_res = fread(&vname[0],sizeof(char),name_len,fp);
size_t vname_res = fread(&vname[0],sizeof(char),name_len,closer.fp);
if(vname_res != name_len)
throw std::runtime_error("npz_load: failed fread");
vname.erase(vname.end()-4,vname.end()); //erase the lagging .npy

//read in the extra field
uint16_t extra_field_len = *(uint16_t*) &local_header[28];
fseek(fp,extra_field_len,SEEK_CUR); //skip past the extra field
fseek(closer.fp,extra_field_len,SEEK_CUR); //skip past the extra field

uint16_t compr_method = *reinterpret_cast<uint16_t*>(&local_header[0]+8);
uint32_t compr_bytes = *reinterpret_cast<uint32_t*>(&local_header[0]+18);
uint32_t uncompr_bytes = *reinterpret_cast<uint32_t*>(&local_header[0]+22);

if(vname == varname) {
NpyArray array = (compr_method == 0) ? load_the_npy_file(fp) : load_the_npz_array(fp,compr_bytes,uncompr_bytes);
fclose(fp);
NpyArray array = (compr_method == 0) ? load_the_npy_file(closer.fp) : load_the_npz_array(closer.fp,compr_bytes,uncompr_bytes);
return array;
}
else {
//skip past the data
uint32_t size = *(uint32_t*) &local_header[22];
fseek(fp,size,SEEK_CUR);
fseek(closer.fp,size,SEEK_CUR);
}
}

fclose(fp);

//if we get here, we haven't found the variable in the file
throw std::runtime_error("npz_load: Variable name "+varname+" not found in "+fname);
}

cnpy::NpyArray cnpy::npy_load(std::string fname) {

FILE* fp = fopen(fname.c_str(), "rb");
struct AutoCloser
{
FILE * fp;
~AutoCloser (void)
{
fclose(fp);
}
} closer;
closer.fp = fopen(fname.c_str(), "rb");

if(!fp) throw std::runtime_error("npy_load: Unable to open file "+fname);
if(!closer.fp) throw std::runtime_error("npy_load: Unable to open file "+fname);

NpyArray arr = load_the_npy_file(fp);
NpyArray arr = load_the_npy_file(closer.fp);

fclose(fp);
return arr;
}

Expand Down