diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-09-12 14:16:50 -0600 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-09-12 14:19:29 -0600 |
| commit | f7cdfff6a85ce52b1d7c0b5131645fcb77405fe8 (patch) | |
| tree | 908af9bf8d1c512e22116cb3afbc89eb5883cc93 /gr-dtv/lib/atsc/atsc_interleaver_impl.cc | |
| parent | a867a290194228d09ba93f0f46e3a4e4523f5396 (diff) | |
| parent | af4323d1e471476efa255e3df745397f7c8a1b71 (diff) | |
Merge remote-tracking branch 'upstream/next' into gtk3
Diffstat (limited to 'gr-dtv/lib/atsc/atsc_interleaver_impl.cc')
| -rw-r--r-- | gr-dtv/lib/atsc/atsc_interleaver_impl.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gr-dtv/lib/atsc/atsc_interleaver_impl.cc b/gr-dtv/lib/atsc/atsc_interleaver_impl.cc index e628fbf30d..cfc9e2996c 100644 --- a/gr-dtv/lib/atsc/atsc_interleaver_impl.cc +++ b/gr-dtv/lib/atsc/atsc_interleaver_impl.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2015 Free Software Foundation, Inc. + * Copyright 2015,2016 Free Software Foundation, Inc. * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,7 +24,6 @@ #include "atsc_interleaver_impl.h" #include "gnuradio/dtv/atsc_consts.h" -#include <stdio.h> namespace gr { namespace dtv { @@ -45,14 +44,15 @@ namespace gr { J = 4; registers = (unsigned char *) malloc(sizeof(unsigned char) * I * ((I - 1) * J)); if (registers == NULL) { - fprintf(stderr, "Out of memory.\n"); - exit(1); + GR_LOG_FATAL(d_logger, "ATSC Interleaver, cannot allocate memory for registers."); + throw std::bad_alloc(); } pointers = (int *) malloc(sizeof(int) * I); if (pointers == NULL) { - fprintf(stderr, "Out of memory.\n"); - exit(1); + free(registers); + GR_LOG_FATAL(d_logger, "ATSC Interleaver, cannot allocate memory for pointers"); + throw std::bad_alloc(); } memset(registers, 0, sizeof(unsigned char) * I * ((I - 1) * J)); |