argilo
/
gr-osmosdr
forked from sdr/gr-osmosdr
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

osmosdr: check for NULL buffers

This commit is contained in:
Dimitri Stolnikov 2012-08-08 20:26:48 +02:00
parent 6a1600eb93
commit f0b3de4d54
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/osmosdr/osmosdr_src_c.cc
View File

@ -66,6 +66,8 @@ osmosdr_src_c::osmosdr_src_c (const std::string &args)
: gr_sync_block ("osmosdr_src_c",
gr_make_io_signature (0, 0, sizeof (gr_complex)),
args_to_io_signature(args)),
_dev(NULL),
_buf(NULL),
_running(true),
_auto_gain(false),
_skipped(0)
@ -135,8 +137,10 @@ osmosdr_src_c::osmosdr_src_c (const std::string &args)
_buf = (unsigned short **) malloc(_buf_num * sizeof(unsigned short *));
for(unsigned int i = 0; i < _buf_num; ++i)
_buf[i] = (unsigned short *) malloc(BUF_SIZE);
if (_buf) {
for(unsigned int i = 0; i < _buf_num; ++i)
_buf[i] = (unsigned short *) malloc(BUF_SIZE);
}
_thread = gruel::thread(_osmosdr_wait, this);
}
@ -154,13 +158,15 @@ osmosdr_src_c::~osmosdr_src_c ()
_dev = NULL;
}
for(unsigned int i = 0; i < _buf_num; ++i) {
if (_buf[i])
free(_buf[i]);
}
if (_buf) {
for(unsigned int i = 0; i < _buf_num; ++i) {
if (_buf[i])
free(_buf[i]);
}
free(_buf);
_buf = NULL;
free(_buf);
_buf = NULL;
}
}
void osmosdr_src_c::_osmosdr_callback(unsigned char *buf, uint32_t len, void *ctx)