From 959907af01dd398fd45ee28413d37f5516ce6047 Mon Sep 17 00:00:00 2001 From: Sakari Bergen Date: Thu, 18 Sep 2008 12:48:36 +0000 Subject: [PATCH] Fix possible double allocation of SF_BROADCAST_INFO git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3751 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/sndfilesource.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index fb00ccb77a..e24acc38fa 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -157,8 +157,10 @@ SndFileSource::SndFileSource (Session& s, ustring path, SampleFormat sfmt, Heade if (writable() && (_flags & Broadcast)) { - _broadcast_info = new SF_BROADCAST_INFO; - memset (_broadcast_info, 0, sizeof (*_broadcast_info)); + if (!_broadcast_info) { + _broadcast_info = new SF_BROADCAST_INFO; + memset (_broadcast_info, 0, sizeof (*_broadcast_info)); + } snprintf_bounded_null_filled (_broadcast_info->description, sizeof (_broadcast_info->description), "BWF %s", _name.c_str()); snprintf_bounded_null_filled (_broadcast_info->originator, sizeof (_broadcast_info->originator), "ardour %d.%d.%d %s", @@ -250,8 +252,10 @@ SndFileSource::open () _length = _info.frames; - _broadcast_info = new SF_BROADCAST_INFO; - memset (_broadcast_info, 0, sizeof (*_broadcast_info)); + if (!_broadcast_info) { + _broadcast_info = new SF_BROADCAST_INFO; + memset (_broadcast_info, 0, sizeof (*_broadcast_info)); + } bool timecode_info_exists;