Commit: 5ea21496069255bfbe0ff71db37624e2cafac406 - frameworks-av (git)

frameworks/av

Commit MetaInfo

• Révision: 5ea21496069255bfbe0ff71db37624e2cafac406 (tree)
• l'heure: 2020-04-23 21:50:38
• Auteur: Michael Goffioul <michael.goffioul@gmai...>
• Commiter: Chih-Wei Huang

Message de Log

Fix unsafe use of memcpy in audiopreprocessing

Memcpy cannot be used with overlapping memory areas. One should use
memmove instead.

See: https://issuetracker.google.com/issues/154712995

Change Summary

• modified: media/libeffects/preprocessing/PreProcessing.cpp

Modification

--- a/media/libeffects/preprocessing/PreProcessing.cpp
+++ b/media/libeffects/preprocessing/PreProcessing.cpp
@@ -1239,7 +1239,7 @@ int PreProcessingFx_Process(effect_handle_t     self,
             memcpy(outBuffer->s16,
                   session->outBuf,
                   fr * session->outChannelCount * sizeof(int16_t));
-            memcpy(session->outBuf,
+            memmove(session->outBuf,
                   session->outBuf + fr * session->outChannelCount,
                   (session->framesOut - fr) * session->outChannelCount * sizeof(int16_t));
             session->framesOut -= fr;
@@ -1302,7 +1302,7 @@ int PreProcessingFx_Process(effect_handle_t     self,
                                                         session->procFrame->data_,
                                                         &frOut);
             }
-            memcpy(session->inBuf,
+            memmove(session->inBuf,
                    session->inBuf + frIn * session->inChannelCount,
                    (session->framesIn - frIn) * session->inChannelCount * sizeof(int16_t));
             session->framesIn -= frIn;
@@ -1380,7 +1380,7 @@ int PreProcessingFx_Process(effect_handle_t     self,
         memcpy(outBuffer->s16 + framesWr * session->outChannelCount,
               session->outBuf,
               fr * session->outChannelCount * sizeof(int16_t));
-        memcpy(session->outBuf,
+        memmove(session->outBuf,
               session->outBuf + fr * session->outChannelCount,
               (session->framesOut - fr) * session->outChannelCount * sizeof(int16_t));
         session->framesOut -= fr;
@@ -1836,7 +1836,7 @@ int PreProcessingFx_ProcessReverse(effect_handle_t     self,
                                                         session->revFrame->data_,
                                                         &frOut);
             }
-            memcpy(session->revBuf,
+            memmove(session->revBuf,
                    session->revBuf + frIn * session->inChannelCount,
                    (session->framesRev - frIn) * session->inChannelCount * sizeof(int16_t));
             session->framesRev -= frIn;