[haiku-commits] haiku: hrev53503 - src/add-ons/media/media-add-ons/mixer

  • From: Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 21 Sep 2019 12:01:45 -0400 (EDT)

hrev53503 adds 1 changeset to branch 'master'
old head: 7fd9865ec6ca857d164e2de867c5944723887cb3
new head: 7abf1b6fba46db78b32cc4a9267a8b7ee019edaa
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=7abf1b6fba46+%5E7fd9865ec6ca

----------------------------------------------------------------------------

7abf1b6fba46: media-add-ons/mixer: Fix 'new[]' array freed with 'delete'
  
  fMixBufferChannelTypes is allocated by new[] in _ApplyOutputFormat(),
  but freed by delete.
  Pointed out by LGTM.
  
  Change-Id: I07b85801e0103094c5751306ea2c50ca9354ddb9
  Reviewed-on: https://review.haiku-os.org/c/haiku/+/1877
  Reviewed-by: Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>

                                      [ Murai Takashi <tmurai01@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev53503
Commit:      7abf1b6fba46db78b32cc4a9267a8b7ee019edaa
URL:         https://git.haiku-os.org/haiku/commit/?id=7abf1b6fba46
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Sat Sep 21 06:56:54 2019 UTC
Committer:   Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
Commit-Date: Sat Sep 21 16:01:37 2019 UTC

----------------------------------------------------------------------------

1 file changed, 2 insertions(+), 2 deletions(-)
src/add-ons/media/media-add-ons/mixer/MixerCore.cpp | 4 ++--

----------------------------------------------------------------------------

diff --git a/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp 
b/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp
index 9d82ac0cba..cb832f693d 100644
--- a/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp
+++ b/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp
@@ -112,7 +112,7 @@ MixerCore::~MixerCore()
                delete[] fResampler;
        }
 
-       delete fMixBufferChannelTypes;
+       delete[] fMixBufferChannelTypes;
 }
 
 
@@ -429,7 +429,7 @@ MixerCore::_ApplyOutputFormat()
        if (fMixBuffer != NULL)
                rtm_free(fMixBuffer);
 
-       delete fMixBufferChannelTypes;
+       delete[] fMixBufferChannelTypes;
 
        fMixBufferFrameRate = (int32)(0.5 + format.frame_rate);
        fMixBufferFrameCount = frames_per_buffer(format);


Other related posts:

  • » [haiku-commits] haiku: hrev53503 - src/add-ons/media/media-add-ons/mixer - Axel Dörfler