Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-20 20:34:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed mismatched free/delete (free is used in rschatitems.cc to delete avatars)

Browse source
This commit is contained in:
csoler 2017-06-02 23:10:43 +02:00
parent 8e7e70035a
commit fb7ac7a8f6
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libretroshare/src/chat/p3chatservice.cc
View file

@ -146,7 +146,7 @@ class p3ChatService::AvatarInfo
~AvatarInfo() ~AvatarInfo()
{ {
delete[] _image_data ; free( _image_data );
_image_data = NULL ; _image_data = NULL ;
_image_size = 0 ; _image_size = 0 ;
} }
@ -159,7 +159,7 @@ class p3ChatService::AvatarInfo
void init(const unsigned char *jpeg_data,int size) void init(const unsigned char *jpeg_data,int size)
{ {
_image_size = size ; _image_size = size ;
_image_data = new unsigned char[size] ; _image_data = (unsigned char*)rs_malloc(size) ;
memcpy(_image_data,jpeg_data,size) ; memcpy(_image_data,jpeg_data,size) ;
} }
AvatarInfo(const unsigned char *jpeg_data,int size) AvatarInfo(const unsigned char *jpeg_data,int size)
@ -169,7 +169,7 @@ class p3ChatService::AvatarInfo
void toUnsignedChar(unsigned char *& data,uint32_t& size) const void toUnsignedChar(unsigned char *& data,uint32_t& size) const
{ {
data = new unsigned char[_image_size] ; data = (unsigned char *)rs_malloc(_image_size) ;
size = _image_size ; size = _image_size ;
memcpy(data,_image_data,size*sizeof(unsigned char)) ; memcpy(data,_image_data,size*sizeof(unsigned char)) ;
} }