summaryrefslogtreecommitdiff
path: root/indra/media_plugins/quicktime
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2010-02-03 15:13:19 -0800
committerCallum Prentice <callum@lindenlab.com>2010-02-03 15:13:19 -0800
commitfea3e5ea7659bcefb6715bd87affdece2b4407fb (patch)
tree786179d64b0eb925dcc61da2d159f98c52f552b7 /indra/media_plugins/quicktime
parent0bee31de32cb5999e7ec06d74f55d34ce0ac052b (diff)
Fix for DEV-45609 "CID-47 and CID-154 - bogus allocation/memset in Quicktime plugin"
Reviewed by Rick.
Diffstat (limited to 'indra/media_plugins/quicktime')
-rw-r--r--indra/media_plugins/quicktime/media_plugin_quicktime.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
index dbc44c8334..26690f64a6 100644
--- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
+++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
@@ -724,8 +724,8 @@ private:
return false;
// allocate some space and grab it
- UInt8* item_data = new UInt8( size + 1 );
- memset( item_data, 0, ( size + 1 ) * sizeof( UInt8* ) );
+ UInt8* item_data = new UInt8[ size + 1 ];
+ memset( item_data, 0, ( size + 1 ) * sizeof( UInt8 ) );
result = QTMetaDataGetItemValue( media_data_ref, item, item_data, size, NULL );
if ( noErr != result )
{