Skip to content

model loading error handling in denoise.c #271

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

model loading error handling in denoise.c #271

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
41 changes: 28 additions & 13 deletions src/denoise.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <stdio.h>
#include "kiss_fft.h"
#include "common.h"
#include <limits.h>
#include "denoise.h"
#include <math.h>
#include "rnnoise.h"
Expand Down Expand Up @@ -235,6 +236,8 @@ struct RNNModel {
RNNModel *rnnoise_model_from_buffer(const void *ptr, int len) {
RNNModel *model;
model = malloc(sizeof(*model));
if (model == NULL) return NULL;

model->blob = NULL;
model->const_blob = ptr;
model->blob_len = len;
Expand All @@ -244,28 +247,40 @@ RNNModel *rnnoise_model_from_buffer(const void *ptr, int len) {
RNNModel *rnnoise_model_from_filename(const char *filename) {
RNNModel *model;
FILE *f = fopen(filename, "rb");
if (f == NULL) return NULL;

model = rnnoise_model_from_file(f);
if (model == NULL) {
fclose(f);
return NULL;
}

model->file = f;
return model;
}

RNNModel *rnnoise_model_from_file(FILE *f) {
if (f == NULL) return NULL;
RNNModel *model;
model = malloc(sizeof(*model));
model->file = NULL;

fseek(f, 0, SEEK_END);
model->blob_len = ftell(f);
fseek(f, 0, SEEK_SET);

model->const_blob = NULL;
model = calloc(1, sizeof(*model));
if (model == NULL) return NULL;

if (fseek(f, 0, SEEK_END) != 0) goto cleanup;
long sz = ftell(f);
if (sz < 0 || sz > INT_MAX) goto cleanup;
if (fseek(f, 0, SEEK_SET) != 0) goto cleanup;

model->blob_len = (int)sz;
// malloc(0) is implementation-defined
if (sz == 0) goto cleanup;
model->blob = malloc(model->blob_len);
if (fread(model->blob, model->blob_len, 1, f) != 1)
{
rnnoise_model_free(model);
return NULL;
}
if (model->blob == NULL) goto cleanup;
if (fread(model->blob, model->blob_len, 1, f) != 1) goto cleanup;
return model;

cleanup:
rnnoise_model_free(model);
return NULL;
}

void rnnoise_model_free(RNNModel *model) {
Expand Down