[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] mkv/libmatroska Matroska.cpp, 1.1.2.23.4.4, 1.1.2.23.4.5
From:       joeli () helixcommunity ! org
Date:       2012-07-19 10:14:45
[Download RAW message or body]

Update of /cvsroot/datatype/mkv/libmatroska
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv24550

Modified Files:
      Tag: hxclient_3_6_1_krill
	Matroska.cpp 
Log Message:
merge one memory leak issue by joeli at 2012/07/19


Index: Matroska.cpp
===================================================================
RCS file: /cvsroot/datatype/mkv/libmatroska/Matroska.cpp,v
retrieving revision 1.1.2.23.4.4
retrieving revision 1.1.2.23.4.5
diff -u -d -r1.1.2.23.4.4 -r1.1.2.23.4.5
--- Matroska.cpp	11 Jun 2012 09:28:07 -0000	1.1.2.23.4.4
+++ Matroska.cpp	19 Jul 2012 10:14:37 -0000	1.1.2.23.4.5
@@ -596,7 +596,7 @@
 							tk->pExtraData = (uint8*)malloc( tk->uExtraData );
 							if(!tk->pExtraData)
 							{
-								HX_FREE(tk);
+								HX_DELETE(tk);
 								return HXR_OUTOFMEMORY;
 							}
 							memcpy( tk->pExtraData, cpriv.GetBuffer(), tk->uExtraData );
@@ -840,7 +840,7 @@
 					                            if(ccs == NULL){
 					                                HX_FREE(tk->pExtraData);
 					                                HX_FREE(tk->pszCodec);
-					                                HX_FREE(tk);									
+					                                HX_DELETE(tk);									
 					                                return HXR_FAIL;
 					                            }
 					                            tk->uContentCompressSetting = ccs->GetSize();
@@ -851,7 +851,7 @@
 					                                {
 					                                    HX_FREE(tk->pExtraData);
 					                                    HX_FREE(tk->pszCodec);				                  \
                
-					                                    HX_FREE(tk);
+					                                    HX_DELETE(tk);
 					                                    return HXR_OUTOFMEMORY;
 					                                }
 					                                if(tk->uContentCompressSetting > 0)
@@ -865,7 +865,7 @@
 					                                HX_FREE(tk->pExtraData);
 					                                HX_FREE(tk->pszCodec);										
 					                                HX_FREE(tk->pContentCompressSetting);					      \
                
-					                                HX_FREE(tk);
+					                                HX_DELETE(tk);
 					                            }
 					                        }
 					                        if(tk == NULL)


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs


[prev in list] [next in list] [prev in thread] [next in thread]