Merge \"src/libFLAC/stream_decoder.c : Fix NULL de-reference. am: 83a817d200 am: 5e39e0d829 am: 10c2965d9b am: 1fa69f344f am: 709f40556d am: 1118807bd4 am: 3424de3df7 am: a5a50068aa am: 4ced2ff0bd am: 45d9bab12f am: 2cfe35c5f2 am: 1d930d738f am: fdbb5b06d1\" into nyc-mr1-dev-plus-aosp
am: c690cad78f
Change-Id: Ib27cc1c846a391c9d5215d81aec30f68d543cb0e
diff --git a/libFLAC/Android.mk b/libFLAC/Android.mk
index 6d97aa9..8c9d706 100644
--- a/libFLAC/Android.mk
+++ b/libFLAC/Android.mk
@@ -26,6 +26,7 @@
LOCAL_CFLAGS += -DHAVE_CONFIG_H -DFLAC__NO_MD5 -DFLAC__INTEGER_ONLY_LIBRARY
LOCAL_CFLAGS += -D_REENTRANT -DPIC -DU_COMMON_IMPLEMENTATION -fPIC
LOCAL_CFLAGS += -O3 -funroll-loops -finline-functions
+LOCAL_CFLAGS += -Werror
LOCAL_ARM_MODE := arm
diff --git a/libFLAC/stream_encoder.c b/libFLAC/stream_encoder.c
index 6380ce6..23cc22d 100644
--- a/libFLAC/stream_encoder.c
+++ b/libFLAC/stream_encoder.c
@@ -2169,7 +2169,6 @@
for(channel = 0; channel < channels; channel++) {
if (buffer[channel] == NULL) {
- encoder->protected_->state = FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
return false;
}
memcpy(&encoder->private_->integer_signal[channel][encoder->private_->current_sample_number], &buffer[channel][j], sizeof(buffer[channel][0]) * n);
