diff --git a/lib_com/options.h b/lib_com/options.h
old mode 100644
new mode 100755
index 4e0286303664f1d797a0c83df8887a63f222c7f1..1fe1bb999c0a93da0b9acc0a615e6c4efe3f6b4a
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -169,6 +169,7 @@
 #define FIX_583_CLANG_TRANS_DET                         /* FhG: Issue 583: clang left shift on ramp_up_flag in transient detector */
 #define NONBE_FIX_589_JBM_TC_OFFSETS                    /* FhG: issue 589: wrong offset into the TC buffers is used in some rendering paths in the JBM main rendering function */
 #define FIX_MEM_REALLOC_IND_LIST                        /* VA: issue 601: failure of the automatic memory re-allocation mechanism when ind_list[] buffer is depleted in MASA mode with 2 TC*/
+#define FIX_581_CLANG_OFFSET_TO_NULL                    /* FhG: issue 581: fix CLANG error about applying an offset to a NULL pointer */
 
 /* ################## End BE DEVELOPMENT switches ######################### */
 
diff --git a/lib_enc/ivas_stereo_mdct_stereo_enc.c b/lib_enc/ivas_stereo_mdct_stereo_enc.c
index b8ab5398ec4556f2e4177294ea8656d7c1c9ad40..3d277e241db16735b4eeb38bb577fdcc08bcb7ab 100755
--- a/lib_enc/ivas_stereo_mdct_stereo_enc.c
+++ b/lib_enc/ivas_stereo_mdct_stereo_enc.c
@@ -1133,15 +1133,29 @@ void initMdctStereoEncData(
     set_s( hStereoMdct->mdct_stereo_mode, -1, 2 );
 
     /*Initialize sfb parameteres for TCX20 */
+#ifdef FIX_581_CLANG_OFFSET_TO_NULL
+    stereo_mdct_init_bands( tcx_coded_lines, TCX_20_CORE, element_brate, igf, igf ? &hIgfGrid[IGF_GRID_LB_NORM] : NULL, &hStereoMdct->stbParamsTCX20.sfbOffset[0], &hStereoMdct->stbParamsTCX20.sfbCnt );
+#else
     stereo_mdct_init_bands( tcx_coded_lines, TCX_20_CORE, element_brate, igf, &hIgfGrid[IGF_GRID_LB_NORM], &hStereoMdct->stbParamsTCX20.sfbOffset[0], &hStereoMdct->stbParamsTCX20.sfbCnt );
+#endif
 
     /*Initialize sfb parameteres for TCX10 */
+#ifdef FIX_581_CLANG_OFFSET_TO_NULL
+    stereo_mdct_init_bands( tcx_coded_lines, TCX_10_CORE, element_brate, igf, igf ? &hIgfGrid[IGF_GRID_LB_SHORT] : NULL,
+                            &hStereoMdct->stbParamsTCX10.sfbOffset[0], &hStereoMdct->stbParamsTCX10.sfbCnt );
+#else
     stereo_mdct_init_bands( tcx_coded_lines, TCX_10_CORE, element_brate, igf, &hIgfGrid[IGF_GRID_LB_SHORT],
                             &hStereoMdct->stbParamsTCX10.sfbOffset[0], &hStereoMdct->stbParamsTCX10.sfbCnt );
+#endif
 
     /*Initialize sfb parameteres for transitions */
+#ifdef FIX_581_CLANG_OFFSET_TO_NULL
+    stereo_mdct_init_bands( tcx_coded_lines, -1, element_brate, igf, igf ? &hIgfGrid[IGF_GRID_LB_TRAN] : NULL,
+                            &hStereoMdct->stbParamsTCX20afterACELP.sfbOffset[0], &hStereoMdct->stbParamsTCX20afterACELP.sfbCnt );
+#else
     stereo_mdct_init_bands( tcx_coded_lines, -1, element_brate, igf, &hIgfGrid[IGF_GRID_LB_TRAN],
                             &hStereoMdct->stbParamsTCX20afterACELP.sfbOffset[0], &hStereoMdct->stbParamsTCX20afterACELP.sfbCnt );
+#endif
 
     set_s( hStereoMdct->IGFStereoMode, -1, 2 );