summaryrefslogtreecommitdiffstats
path: root/Gui/interface.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-06-25 16:49:53 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-06-25 16:49:53 +0000
commit42b784ac1a0c71e7d494db68ff700101461f840f (patch)
tree5f64d2b91ff78cbb9454456f0b9203faf1812d7e /Gui/interface.c
parent80f2b9c5a68d9899965fc30001807cd827ca4174 (diff)
downloadmpv-42b784ac1a0c71e7d494db68ff700101461f840f.tar.bz2
mpv-42b784ac1a0c71e7d494db68ff700101461f840f.tar.xz
string handling security fixes
patch by Nicholas Kain, Alexander Strasser <eclipse7@gmx.net> reviewed by Pontscho, Alex, Rich git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12647 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/interface.c')
-rw-r--r--Gui/interface.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/Gui/interface.c b/Gui/interface.c
index 8778002c05..52c0ab3168 100644
--- a/Gui/interface.c
+++ b/Gui/interface.c
@@ -54,8 +54,12 @@ char * gstrcat( char ** dest,char * src )
if ( *dest )
{
tmp=malloc( strlen( *dest ) + strlen( src ) + 1 );
- strcpy( tmp,*dest ); strcat( tmp,src ); free( *dest );
- }
+
+ if ( tmp ) /* TODO: advanced error handling */
+ {
+ strcpy( tmp,*dest ); strcat( tmp,src ); free( *dest );
+ }
+ }
else
{ tmp=malloc( strlen( src ) + 1 ); strcpy( tmp,src ); }
*dest=tmp;