4 files changed, 18 insertions, 26 deletions
diff --git a/libSBRdec/src/env_calc.cpp b/libSBRdec/src/env_calc.cpp
index fa5330a..73bd7ba 100644
--- a/libSBRdec/src/env_calc.cpp
+++ b/libSBRdec/src/env_calc.cpp
@@ -2031,7 +2031,7 @@ static void adjustTimeSlotHQ(
   FIXP_SGL direct_ratio = /*FL2FXCONST_SGL(1.0f) */ (FIXP_SGL)MAXVAL_SGL - smooth_ratio;
   int    index = *ptrPhaseIndex;
   UCHAR   harmIndex = *ptrHarmIndex;
-  register int freqInvFlag = (lowSubband & 1);
+  int freqInvFlag = (lowSubband & 1);
   FIXP_DBL sineLevel;
   int shift;
 
diff --git a/libSBRdec/src/env_extr.cpp b/libSBRdec/src/env_extr.cpp
index dacd951..4d53a13 100644
--- a/libSBRdec/src/env_extr.cpp
+++ b/libSBRdec/src/env_extr.cpp
@@ -904,6 +904,9 @@ static const FRAME_INFO v_frame_info4_8 = { 0, 4, {0, 2, 4, 6, 8}, {1, 1, 1, 1},
             break;
         default:
             FDK_ASSERT(0);
+            /* in case assertion checks are disabled, force a definite memory fault at first access */
+            pTable = NULL;
+            break;
     }
 
     /* look number of envelopes in table */
diff --git a/libSBRdec/src/lpp_tran.cpp b/libSBRdec/src/lpp_tran.cpp
index c2ca732..343aec3 100644
--- a/libSBRdec/src/lpp_tran.cpp
+++ b/libSBRdec/src/lpp_tran.cpp
@@ -96,10 +96,6 @@ amm-info@iis.fraunhofer.de
   \sa lppTransposer(), main_audio.cpp, sbr_scale.h, \ref documentationOverview
 */
 
-#ifdef __ANDROID__
-#include <cutils/log.h>
-#endif
-
 #include "lpp_tran.h"
 
 #include "sbr_ram.h"
@@ -260,6 +256,7 @@ void lppTransposer (HANDLE_SBR_LPP_TRANS hLppTrans,    /*!< Handle of lpp transp
   int ovLowBandShift;
   int lowBandShift;
 /*  int ovHighBandShift;*/
+  int targetStopBand;
 
 
   alphai[0] = FL2FXCONST_SGL(0.0f);
@@ -276,32 +273,24 @@ void lppTransposer (HANDLE_SBR_LPP_TRANS hLppTrans,    /*!< Handle of lpp transp
 
   autoCorrLength = pSettings->nCols + pSettings->overlap;
 
-  if (pSettings->noOfPatches > 0) {
-    /* Set upper subbands to zero:
-       This is required in case that the patches do not cover the complete highband
-       (because the last patch would be too short).
-       Possible optimization: Clearing bands up to usb would be sufficient here. */
-    int targetStopBand = patchParam[pSettings->noOfPatches-1].targetStartBand
-                   + patchParam[pSettings->noOfPatches-1].numBandsInPatch;
+  /* Set upper subbands to zero:
+     This is required in case that the patches do not cover the complete highband
+     (because the last patch would be too short).
+     Possible optimization: Clearing bands up to usb would be sufficient here. */
+  targetStopBand = patchParam[pSettings->noOfPatches-1].targetStartBand
+                 + patchParam[pSettings->noOfPatches-1].numBandsInPatch;
 
-    int memSize = ((64) - targetStopBand) * sizeof(FIXP_DBL);
+  int memSize = ((64) - targetStopBand) * sizeof(FIXP_DBL);
 
-    if (!useLP) {
-      for (i = startSample; i < stopSampleClear; i++) {
-        FDKmemclear(&qmfBufferReal[i][targetStopBand], memSize);
-        FDKmemclear(&qmfBufferImag[i][targetStopBand], memSize);
-      }
-    } else
+  if (!useLP) {
     for (i = startSample; i < stopSampleClear; i++) {
       FDKmemclear(&qmfBufferReal[i][targetStopBand], memSize);
+      FDKmemclear(&qmfBufferImag[i][targetStopBand], memSize);
     }
+  } else
+  for (i = startSample; i < stopSampleClear; i++) {
+    FDKmemclear(&qmfBufferReal[i][targetStopBand], memSize);
   }
-#ifdef __ANDROID__
-  else {
-    // Safetynet logging
-    android_errorWriteLog(0x534e4554, "112160868");
-  }
-#endif
 
   /* init bwIndex for each patch */
   FDKmemclear(bwIndex, MAX_NUM_PATCHES*sizeof(INT));
diff --git a/libSBRdec/src/sbr_rom.cpp b/libSBRdec/src/sbr_rom.cpp
index c48ce35..4f2cc48 100644
--- a/libSBRdec/src/sbr_rom.cpp
+++ b/libSBRdec/src/sbr_rom.cpp
@@ -1185,7 +1185,7 @@ const FIXP_DBL Alphas[NO_ICC_LEVELS] = {
 #define  FL2FXCONST_PS FL2FXCONST_SGL
 #else
 #define  FIXP_PS FIXP_DBL
-#define  FXP_CAST
+#define  FXP_CAST(x) ((FIXP_DBL)(x))
 #define  FL2FXCONST_PS FL2FXCONST_DBL
 #endif