Avoid crash if wave remainer is not specified in caller, which is all…

…owed by api.
batermj · Sep 21, 2015 · e37685f · e37685f
1 parent 662b568
commit e37685f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/feat/feature-fbank.cc b/src/feat/feature-fbank.cc
@@ -111,7 +111,8 @@ void Fbank::ComputeInternal(const VectorBase<BaseFloat> &wave,
   int32 cols_out = opts_.mel_opts.num_bins + opts_.use_energy;
   if (rows_out == 0) {
     output->Resize(0, 0);
-    *wave_remainder = wave;
+    if (wave_remainder != NULL)
+      *wave_remainder = wave;
     return;
   }
   // Prepare the output buffer

diff --git a/src/feat/feature-mfcc.cc b/src/feat/feature-mfcc.cc
@@ -122,7 +122,8 @@ void Mfcc::ComputeInternal(const VectorBase<BaseFloat> &wave,
       cols_out = opts_.num_ceps;
   if (rows_out == 0) {
     output->Resize(0, 0);
-    *wave_remainder = wave;
+    if (wave_remainder != NULL)
+      *wave_remainder = wave;
     return;
   }
   output->Resize(rows_out, cols_out);

diff --git a/src/feat/feature-plp.cc b/src/feat/feature-plp.cc
@@ -167,7 +167,8 @@ void Plp::ComputeInternal(const VectorBase<BaseFloat> &wave,
       cols_out = opts_.num_ceps;
   if (rows_out == 0) {
     output->Resize(0, 0);
-    *wave_remainder = wave;
+    if (wave_remainder != NULL)
+      *wave_remainder = wave;
     return;
   }
   output->Resize(rows_out, cols_out);