Merge pull request #788 from csoler/v0.6-PRTest

V0.6 pr test

libbitdht/src/util/bdbloom.cc

@@ -144,6 +144,11 @@ std::string bloomFilter::getFilter()
 		bytes++;
 	}
 
+	if (bytes==0)
+	{
+		std::cerr << "(EE) Error. Cannot allocate memory for 0 byte in " << __PRETTY_FUNCTION__ << std::endl;
+		return std::string();
+	}
 	// convert to binary array.
 	uint8_t *tmparray = (uint8_t *) malloc(bytes);
     

libresapi/src/api/RsControlModule.cpp

@@ -25,8 +25,8 @@ RsControlModule::RsControlModule(int argc, char **argv, StateTokenServer* sts, A
     mRunState(WAITING_INIT),
     mAutoLoginNextTime(false),
     mWantPassword(false),
-    mPassword(""),
+    mPrevIsBad(false),
-    mPrevIsBad(false)
+    mPassword("")
 {
     mStateToken = sts->getNewToken();
     this->argc = argc;

libresapi/src/api/RsControlModule.h

@@ -77,7 +77,7 @@ private:
     // to notify that a password callback is waiting
     // to answer the request, clear the flag and set the password
     bool mWantPassword;
-	bool mPrevIsBad;
+    bool mPrevIsBad ;
     std::string mTitle;
     std::string mKeyName;
     std::string mPassword;

libretroshare/src/pqi/pqiservice.h

@@ -77,7 +77,7 @@ public:
 
 	virtual int	tick() { return 0; }
 
-    virtual void getItemNames(std::map<uint8_t,std::string>& names) const {}	// This does nothing by default. Service should derive it in order to give info for the UI
+	virtual void getItemNames(std::map<uint8_t,std::string>& /*names*/) const {}	// This does nothing by default. Service should derive it in order to give info for the UI
 
 private:
 	p3ServiceServerIface *mServiceServer; // const, no need for mutex.

plugins/VOIP/gui/VOIPGUIHandler.cpp

@@ -155,7 +155,7 @@ void VOIPGUIHandler::ReceivedVoipBandwidthInfo(const RsPeerId &peer_id, int byte
 #endif
 
 	ChatDialog *di = ChatDialog::getExistingChat(ChatId(peer_id)) ;
-	if(!di)
+	if(di)
 	{
 
 		ChatWidget *cw = di->getChatWidget();

plugins/VOIP/gui/VOIPToasterNotify.cpp

@@ -180,7 +180,7 @@ ToasterItem* VOIPToasterNotify::testToasterItem(QString tag)
 	if (tag == "Invitation") toaster = new ToasterItem(new VOIPToasterItem(ownId, tr("Test VOIP Invitation"), VOIPToasterItem::Invitation));
 #endif
 	if (tag == "AudioCall") toaster = new ToasterItem(new VOIPToasterItem(ownId, tr("Test VOIP Audio Call"), VOIPToasterItem::AudioCall));
-	if (tag == "VideoCall") toaster = new ToasterItem(new VOIPToasterItem(ownId, tr("Test VOIP Video Call"), VOIPToasterItem::VideoCall));
+	if (tag == "VideoCall" || toaster == NULL) toaster = new ToasterItem(new VOIPToasterItem(ownId, tr("Test VOIP Video Call"), VOIPToasterItem::VideoCall));
 
 	return toaster;
 }

retroshare-gui/src/gui/Identity/IdDialog.cpp

@@ -2408,8 +2408,8 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
 				}
 			}
 
-            if(n_selected_items==1)
+			if (n_selected_items==1)
-				QAction *action = contextMenu->addAction(QIcon(":/images/chat_24.png"),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ;
+				contextMenu->addAction(QIcon(":/images/chat_24.png"),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ;
 
 			// always allow to send messages
 			contextMenu->addAction(QIcon(":/images/mail_new.png"), tr("Send message"), this, SLOT(sendMsg()));

retroshare-gui/src/gui/MainWindow.cpp

@@ -676,7 +676,8 @@ void MainWindow::updateTrayCombine()
 
         }
     }
-    notifyMenu->menuAction()->setVisible(visible);
+    if (notifyMenu)
+        notifyMenu->menuAction()->setVisible(visible);
 
     // update tray icon
     updateFriends();

retroshare-gui/src/gui/common/MimeTextEdit.cpp

@@ -77,6 +77,7 @@ void MimeTextEdit::insertFromMimeData(const QMimeData* source)
 		}
 	}
 #endif
+	if (source == NULL) return;
 
 	//insert retroshare links
 	QList<RetroShareLink> links;

retroshare-gui/src/gui/common/UserNotify.cpp

@@ -99,7 +99,7 @@ void UserNotify::initialize(QToolBar *mainToolBar, QAction *mainAction, QListWid
 		}
 	}
 	mListItem = listItem;
-	if (mListItem && !mMainAction) {
+	if (mListItem && mMainAction) {
 		mButtonText = mMainAction->text();
 	}
 }

retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp

@@ -863,7 +863,8 @@ void GxsGroupDialog::requestGroup(const RsGxsGroupId &groupId)
 	std::cerr << std::endl;
 
 	uint32_t token;
-	mInternalTokenQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, GXSGROUP_INTERNAL_LOADGROUP);
+	if (mInternalTokenQueue)
+		mInternalTokenQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, GXSGROUP_INTERNAL_LOADGROUP) ;
 }
 
 void GxsGroupDialog::loadGroup(uint32_t token)

retroshare-gui/src/util/HandleRichText.cpp

@@ -230,12 +230,13 @@ bool RsHtml::canReplaceAnchor(QDomDocument &/*doc*/, QDomElement &/*element*/, c
 	case RetroShareLink::TYPE_PERSON:
 	case RetroShareLink::TYPE_FORUM:
 	case RetroShareLink::TYPE_CHANNEL:
-          case RetroShareLink::TYPE_POSTED:
 	case RetroShareLink::TYPE_SEARCH:
 	case RetroShareLink::TYPE_MESSAGE:
 	case RetroShareLink::TYPE_EXTRAFILE:
 	case RetroShareLink::TYPE_PRIVATE_CHAT:
 	case RetroShareLink::TYPE_PUBLIC_MSG:
+	case RetroShareLink::TYPE_POSTED:
+	case RetroShareLink::TYPE_IDENTITY:
 		// not yet implemented
 		break;
 
@@ -259,12 +260,13 @@ void RsHtml::anchorStylesheetForImg(QDomDocument &/*doc*/, QDomElement &/*elemen
 	case RetroShareLink::TYPE_PERSON:
 	case RetroShareLink::TYPE_FORUM:
 	case RetroShareLink::TYPE_CHANNEL:
-        case RetroShareLink::TYPE_POSTED:
 	case RetroShareLink::TYPE_SEARCH:
 	case RetroShareLink::TYPE_MESSAGE:
 	case RetroShareLink::TYPE_EXTRAFILE:
 	case RetroShareLink::TYPE_PRIVATE_CHAT:
 	case RetroShareLink::TYPE_PUBLIC_MSG:
+	case RetroShareLink::TYPE_POSTED:
+	case RetroShareLink::TYPE_IDENTITY:
 		// not yet implemented
 		break;