From a8084b07e3e85f28fbd09bf0b3f4ad37cd175671 Mon Sep 17 00:00:00 2001 From: "wu@webrtc.org" Date: Wed, 8 Feb 2012 17:56:39 +0000 Subject: [PATCH] Revert r1628 which causes the crash of voe_auto_test. With r1628, it's possible the second memcpy got a NULL nearendClean. TBR=bjornv Review URL: https://webrtc-codereview.appspot.com/390005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1643 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/audio_processing/aecm/echo_control_mobile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/audio_processing/aecm/echo_control_mobile.c b/src/modules/audio_processing/aecm/echo_control_mobile.c index cc25671893..4c5edc704b 100644 --- a/src/modules/audio_processing/aecm/echo_control_mobile.c +++ b/src/modules/audio_processing/aecm/echo_control_mobile.c @@ -337,10 +337,10 @@ WebRtc_Word32 WebRtcAecm_Process(void *aecmInst, const WebRtc_Word16 *nearendNoi if (aecm->ECstartup) { - if ((nearendClean == NULL) && (nearendNoisy != out)) + if (nearendClean == NULL) { memcpy(out, nearendNoisy, sizeof(short) * nrOfSamples); - } else if (nearendClean != out) + } else { memcpy(out, nearendClean, sizeof(short) * nrOfSamples); }