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

Fix error reported by CppChecker:

Browse source 
/libretroshare/src/gxs/rsgenexchange.cc:2850: erreur : Cppcheck:
Dereferencing 'grp' after it is deallocated / released
/libretroshare/src/gxstunnel/p3gxstunnel.cc:1004: erreur : Cppcheck:
Invalid usage of output stream: '<< std::cerr'.
/libretroshare/src/util/contentvalue.cc:185: erreur : Cppcheck: Memory
leak: dest
/openpgpsdk/src/openpgpsdk/reader_armoured.c:575: erreur : Cppcheck:
Common realloc mistake: 'buf' nulled but not freed upon failure
/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp:103: erreur :
Cppcheck: Array 'byteUnits[4]' accessed at index 4, which is out of
bounds.
/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp:122: erreur :
Cppcheck: Array 'byteUnits[4]' accessed at index 4, which is out of
bounds.
/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp:141: erreur :
Cppcheck: Array 'byteUnits[4]' accessed at index 4, which is out of
bounds.
/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp:92: erreur :
Cppcheck: Array 'byteUnits[4]' accessed at index 4, which is out of
bounds.
/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp:111: erreur :
Cppcheck: Array 'byteUnits[4]' accessed at index 4, which is out of
bounds.
/retroshare-gui/src/gui/People/PeopleDialog.cpp:774: erreur : Cppcheck:
Uninitialized variable: layout
/retroshare-gui/src/gui/People/PeopleDialog.cpp:864: erreur : Cppcheck:
Uninitialized variable: layout
/retroshare-gui/src/gui/common/AvatarWidget.cpp:225: erreur : Cppcheck:
Uninitialized variable: status
/retroshare-nogui/src/rpc/proto/rpcprotostream.cc:805: erreur :
Cppcheck: Memory leak: buffer
/supportlibs/pegmarkdown/GLibFacade.c:150: erreur : Cppcheck: va_list
'args' was opened but not closed by va_end().
/openpgpsdk/src/openpgpsdk/reader_armoured.c:575: erreur : Cppcheck:
Common realloc mistake: 'buf' nulled but not freed upon failure
/tests/unittests/libretroshare/serialiser/rsturtleitem_test.cc:213:
erreur : Cppcheck: Return value of allocation function 'init_item' is
not stored.
This commit is contained in:
Phenom 2016-03-20 12:10:56 +01:00
parent 2e9d22c580
commit b13292bb80
11 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libretroshare/src/gxs/rsgenexchange.cc
View file

@ -2844,11 +2844,11 @@ void RsGenExchange::processRecvdGroups()
if(gpsi.mAttempts == VALIDATE_MAX_ATTEMPTS) if(gpsi.mAttempts == VALIDATE_MAX_ATTEMPTS)
{ {
delete grp;
erase = true;
#ifdef GEN_EXCH_DEBUG #ifdef GEN_EXCH_DEBUG
std::cerr << " max attempts " << VALIDATE_MAX_ATTEMPTS << " reached. Will delete group " << grp->grpId << std::endl; std::cerr << " max attempts " << VALIDATE_MAX_ATTEMPTS << " reached. Will delete group " << grp->grpId << std::endl;
#endif #endif
delete grp;
erase = true;
} }
else else
{ {

2
libretroshare/src/gxstunnel/p3gxstunnel.cc
View file

@ -1001,7 +1001,7 @@ void p3GxsTunnelService::handleRecvDHPublicKey(RsGxsTunnelDHPublicKeyItem *item)
#ifdef DEBUG_GXS_TUNNEL #ifdef DEBUG_GXS_TUNNEL
std::cerr << " DH key computed. Tunnel is now secured!" << std::endl; std::cerr << " DH key computed. Tunnel is now secured!" << std::endl;
std::cerr << " Key computed: " << RsUtil::BinToHex((char*)pinfo.aes_key,16) << std::cerr << std::endl; std::cerr << " Key computed: " << RsUtil::BinToHex((char*)pinfo.aes_key,16) << std::endl;
std::cerr << " Sending a ACK packet." << std::endl; std::cerr << " Sending a ACK packet." << std::endl;
#endif #endif

1
libretroshare/src/util/contentvalue.cc
View file

@ -182,6 +182,7 @@ void ContentValue::put(const std::string &key, uint32_t len, const char* value){
mKvData.insert(std::pair<std::string, std::pair<uint32_t, char*> > mKvData.insert(std::pair<std::string, std::pair<uint32_t, char*> >
(key, std::pair<uint32_t, char*>(len, dest))); (key, std::pair<uint32_t, char*>(len, dest)));
//delete[] dest; //Deleted by clearData()
} }
bool ContentValue::getAsBool(const std::string &key, bool& value) const{ bool ContentValue::getAsBool(const std::string &key, bool& value) const{

10
openpgpsdk/src/openpgpsdk/reader_armoured.c
View file

@ -572,7 +572,15 @@ static int parse_headers(dearmour_arg_t *arg,ops_error_t **errors,
if(size <= nbuf+1) if(size <= nbuf+1)
{ {
size+=size+80; size+=size+80;
buf=realloc(buf,size); char *nbuf;
nbuf=realloc(buf,size);
if (nbuf == NULL)
{
free(buf);
rtn=-1;
goto end;
}
buf = nbuf;
} }
buf[nbuf++]=c; buf[nbuf++]=c;
} }

6
retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp
View file

@ -96,7 +96,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
temp = ""; temp = "";
} else { } else {
multi = 1.0; multi = 1.0;
for(int i = 0; i < 5; ++i) { for(int i = 0; i < 4; ++i) {
if (fileSize < 1024) { if (fileSize < 1024) {
fileSize = index.data().toLongLong(); fileSize = index.data().toLongLong();
temp.sprintf("%.2f ", fileSize / multi); temp.sprintf("%.2f ", fileSize / multi);
@ -115,7 +115,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
temp = ""; temp = "";
} else { } else {
multi = 1.0; multi = 1.0;
for(int i = 0; i < 5; ++i) { for(int i = 0; i < 4; ++i) {
if (remaining < 1024) { if (remaining < 1024) {
remaining = index.data().toLongLong(); remaining = index.data().toLongLong();
temp.sprintf("%.2f ", remaining / multi); temp.sprintf("%.2f ", remaining / multi);
@ -134,7 +134,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
temp = ""; temp = "";
} else { } else {
multi = 1.0; multi = 1.0;
for(int i = 0; i < 5; ++i) { for(int i = 0; i < 4; ++i) {
if (completed < 1024) { if (completed < 1024) {
completed = index.data().toLongLong(); completed = index.data().toLongLong();
temp.sprintf("%.2f ", completed / multi); temp.sprintf("%.2f ", completed / multi);

4
retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp
View file

@ -85,7 +85,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
temp = ""; temp = "";
} else { } else {
multi = 1.0; multi = 1.0;
for(int i = 0; i < 5; ++i) { for(int i = 0; i < 4; ++i) {
if (fileSize < 1024) { if (fileSize < 1024) {
fileSize = index.data().toLongLong(); fileSize = index.data().toLongLong();
temp.sprintf("%.2f ", fileSize / multi); temp.sprintf("%.2f ", fileSize / multi);
@ -104,7 +104,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
temp = ""; temp = "";
} else { } else {
multi = 1.0; multi = 1.0;
for(int i = 0; i < 5; ++i) { for(int i = 0; i < 4; ++i) {
if (transferred < 1024) { if (transferred < 1024) {
transferred = index.data().toLongLong(); transferred = index.data().toLongLong();
temp.sprintf("%.2f ", transferred / multi); temp.sprintf("%.2f ", transferred / multi);

4
retroshare-gui/src/gui/People/PeopleDialog.cpp
View file

@ -768,7 +768,7 @@ void PeopleDialog::pf_dropEventOccursExt(QDropEvent *event)
QWidget *wid = QWidget *wid =
qobject_cast<QWidget *>(event->source());//QT5 return QObject qobject_cast<QWidget *>(event->source());//QT5 return QObject
FlowLayout *layout; FlowLayout *layout = NULL;
if (wid) layout = if (wid) layout =
qobject_cast<FlowLayout *>(wid->layout()); qobject_cast<FlowLayout *>(wid->layout());
if (layout) { if (layout) {
@ -858,7 +858,7 @@ void PeopleDialog::pf_dropEventOccursInt(QDropEvent *event)
QWidget *wid = QWidget *wid =
qobject_cast<QWidget *>(event->source());//QT5 return QObject qobject_cast<QWidget *>(event->source());//QT5 return QObject
FlowLayout *layout; FlowLayout *layout = NULL;
if (wid) layout = if (wid) layout =
qobject_cast<FlowLayout *>(wid->layout()); qobject_cast<FlowLayout *>(wid->layout());
if (layout) { if (layout) {

2
retroshare-gui/src/gui/common/AvatarWidget.cpp
View file

@ -177,7 +177,7 @@ void AvatarWidget::refreshStatus()
} }
case STATUS_FRAME: case STATUS_FRAME:
{ {
uint32_t status ; uint32_t status = 0;
if(mId.isNotSet()) if(mId.isNotSet())
return ; return ;

1
retroshare-nogui/src/rpc/proto/rpcprotostream.cc
View file

@ -802,6 +802,7 @@ bool fill_stream_data(rsctrl::stream::StreamData &data, const RpcStream &stream)
{ {
std::cerr << "fill_stream_data() Failed to get data. data_size=" << data_size << ", base_loc=" << base_loc << " !"; std::cerr << "fill_stream_data() Failed to get data. data_size=" << data_size << ", base_loc=" << base_loc << " !";
std::cerr << std::endl; std::cerr << std::endl;
free(buffer);
return false; return false;
} }

1
supportlibs/pegmarkdown/GLibFacade.c
View file

@ -147,6 +147,7 @@ void g_string_append_printf(GString* baseString, char* format, ...)
g_string_append(baseString, formattedString); g_string_append(baseString, formattedString);
free(formattedString); free(formattedString);
} }
va_end(args);
} }
void g_string_prepend(GString* baseString, char* prependedString) void g_string_prepend(GString* baseString, char* prependedString)

3
tests/unittests/libretroshare/serialiser/rsturtleitem_test.cc
View file

@ -187,12 +187,11 @@ bool operator==(const RsTurtleStringSearchRequestItem& it1,const RsTurtleStringS
return false ; return false ;
return true ; return true ;
} }
RsSerialType* init_item(TurtleFileInfo& info) void init_item(TurtleFileInfo& info)
{ {
info.hash = RsFileHash("3f753e8ac3b94ab9fddfad94480f747bf4418370"); info.hash = RsFileHash("3f753e8ac3b94ab9fddfad94480f747bf4418370");
info.name = "toto.png"; info.name = "toto.png";
info.size = 0x3392085443897ull ; info.size = 0x3392085443897ull ;
return new RsTurtleSerialiser();
} }
bool operator==(const TurtleFileInfo& it1,const TurtleFileInfo& it2) bool operator==(const TurtleFileInfo& it1,const TurtleFileInfo& it2)
{ {