From 0efc6b00a1c395ca02b8d2aded907c0fb375960f Mon Sep 17 00:00:00 2001 From: csoler Date: Wed, 29 Jan 2020 21:02:46 +0100 Subject: [PATCH] fixed missing check in AvatarInfo against empty image data --- libretroshare/src/chat/p3chatservice.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libretroshare/src/chat/p3chatservice.cc b/libretroshare/src/chat/p3chatservice.cc index 2f5df22fe..28ade2674 100644 --- a/libretroshare/src/chat/p3chatservice.cc +++ b/libretroshare/src/chat/p3chatservice.cc @@ -156,9 +156,17 @@ class p3ChatService::AvatarInfo void init(const unsigned char *jpeg_data,int size) { - _image_size = size ; - _image_data = (unsigned char*)rs_malloc(size) ; - memcpy(_image_data,jpeg_data,size) ; + if(size == 0) + { + _image_size = 0; + _image_data = nullptr; + } + else + { + _image_size = size ; + _image_data = (unsigned char*)rs_malloc(size) ; + memcpy(_image_data,jpeg_data,size) ; + } } AvatarInfo(const unsigned char *jpeg_data,int size) {