Merge pull request #1878 from csoler/v0.6-ImprovedGUI_4

[WIP] fixing some GUI bugs

libretroshare/src/pqi/authssl.cc

@@ -806,22 +806,22 @@ X509 *AuthSSLimpl::SignX509ReqWithGPG(X509_REQ *req, long /*days*/)
         X509_NAME_free(issuer_name);
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-		  // (does not leak the key creation date to the outside anymore. for more privacy)
+		// (does not leak the key creation date to the outside anymore. for more privacy)
-		  ASN1_TIME_set(X509_get_notBefore(x509), 0);
+		ASN1_TIME_set(X509_get_notBefore(x509), 0);
-		  ASN1_TIME_set(X509_get_notAfter(x509), 0);
+		ASN1_TIME_set(X509_get_notAfter(x509), 0);
 #else
-		  // NEW code, set validity time between 2010 and 2110 (remember to change it when, if OpenSSL check it by default. ;) )
+		// NEW code, set validity time between 2010 and 2110 (remember to change it when, if OpenSSL check it by default. ;) )
-		  // (does not leak the key creation date to the outside anymore. for more privacy)
+		// (does not leak the key creation date to the outside anymore. for more privacy)
-		  if (!ASN1_TIME_set_string(X509_getm_notBefore(x509), "20100101000000Z"))
+		if (!ASN1_TIME_set_string(X509_getm_notBefore(x509), "20100101000000Z"))
-		  {
+		{
-			  RsErr() << __PRETTY_FUNCTION__ << " Set notBefore FAIL" << std::endl;
+			RsErr() << __PRETTY_FUNCTION__ << " Set notBefore FAIL" << std::endl;
-			  return NULL;
+			return NULL;
-		  }
+		}
-		  if (!ASN1_TIME_set_string(X509_getm_notAfter(x509), "21100101000000Z"))
+		if (!ASN1_TIME_set_string(X509_getm_notAfter(x509), "21100101000000Z"))
-		  {
+		{
-			  RsErr() << __PRETTY_FUNCTION__ << " Set notAfter FAIL" << std::endl;
+			RsErr() << __PRETTY_FUNCTION__ << " Set notAfter FAIL" << std::endl;
-			  return NULL;
+			return NULL;
-		  }
+		}
 #endif
 
         if (!X509_set_subject_name(x509, X509_REQ_get_subject_name(req)))

libretroshare/src/serialiser/rstypeserializer.cc

@@ -543,10 +543,16 @@ void RsTypeSerializer::RawMemoryWrapper::serial_process(
 		break;
 	case RsGenericSerializer::DESERIALIZE:
 	{
+        // In case first,second is not properly initialized, we set them to nullptr,0
+        first = nullptr;
+        second = 0;
+
 		uint32_t serialSize = 0;
 		RS_SERIAL_PROCESS(serialSize);
+
 		if(!ctx.mOk) break;
-		ctx.mOk = serialSize <= MAX_SERIALIZED_CHUNK_SIZE;
+		ctx.mOk = (serialSize <= MAX_SERIALIZED_CHUNK_SIZE);
+
 		if(!ctx.mOk)
 		{
 			RsErr() << __PRETTY_FUNCTION__
@@ -565,25 +571,23 @@ void RsTypeSerializer::RawMemoryWrapper::serial_process(
 			break;
 		}
 
-		ctx.mOk = ctx.mSize >= ctx.mOffset + serialSize;
+		ctx.mOk = (ctx.mSize >= ctx.mOffset + serialSize);
+
 		if(!ctx.mOk)
 		{
-			RsErr() << __PRETTY_FUNCTION__ << std::errc::no_buffer_space
+			RsErr() << __PRETTY_FUNCTION__ << std::errc::no_buffer_space << std::endl;
-			        << std::endl;
 			print_stacktrace();
 
 			clear();
 			break;
 		}
 
-		if(serialSize != second)
+		first = reinterpret_cast<uint8_t*>(malloc(serialSize));
-		{
+		second = serialSize;
-			first = reinterpret_cast<uint8_t*>(realloc(first, serialSize));
+
-			second = serialSize;
+		memcpy(first, ctx.mData + ctx.mOffset, serialSize);
-		}
+		ctx.mOffset += serialSize;
 
-		memcpy(first, ctx.mData + ctx.mOffset, second);
-		ctx.mOffset += second;
 		break;
 	}
 	case RsGenericSerializer::PRINT:  break;

libretroshare/src/turtle/rsturtleitem.h

@@ -166,7 +166,13 @@ class RsTurtleRegExpSearchRequestItem: public RsTurtleFileSearchRequestItem
 class RsTurtleGenericSearchRequestItem: public RsTurtleSearchRequestItem
 {
 	public:
-		RsTurtleGenericSearchRequestItem() : RsTurtleSearchRequestItem(RS_TURTLE_SUBTYPE_GENERIC_SEARCH_REQUEST) {}
+		RsTurtleGenericSearchRequestItem()
+            : RsTurtleSearchRequestItem(RS_TURTLE_SUBTYPE_GENERIC_SEARCH_REQUEST),
+              service_id(0),
+              search_data_len(0),
+              request_type(0),
+              search_data(nullptr)
+        {}
         virtual ~RsTurtleGenericSearchRequestItem() { clear(); }
 
         uint16_t service_id ;		// service to search
@@ -221,7 +227,11 @@ class RsTurtleFTSearchResultItem: public RsTurtleSearchResultItem
 class RsTurtleGenericSearchResultItem: public RsTurtleSearchResultItem
 {
 	public:
-        RsTurtleGenericSearchResultItem() : RsTurtleSearchResultItem(RS_TURTLE_SUBTYPE_GENERIC_SEARCH_RESULT){}
+        RsTurtleGenericSearchResultItem()
+            : RsTurtleSearchResultItem(RS_TURTLE_SUBTYPE_GENERIC_SEARCH_RESULT),
+		      result_data(nullptr),
+		      result_data_len(0)
+        {}
         virtual ~RsTurtleGenericSearchResultItem() {}
 
         uint32_t count() const { return result_data_len/50 ; }	// This is a blind size estimate. We should probably use the actual size to limit search results.

retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp

@@ -42,13 +42,9 @@ std::ostream& operator<<(std::ostream& o, const QModelIndex& i);// defined elsew
 const QString RsGxsForumModel::FilterString("filtered");
 
 RsGxsForumModel::RsGxsForumModel(QObject *parent)
-    : QAbstractItemModel(parent)
+    : QAbstractItemModel(parent), mUseChildTS(false),mFilteringEnabled(false),mTreeMode(TREE_MODE_TREE)
 {
     initEmptyHierarchy(mPosts);
-
-    mUseChildTS=false;
-    mFilteringEnabled=false;
-    mTreeMode = TREE_MODE_TREE;
 }
 
 void RsGxsForumModel::preMods()

retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp

@@ -57,6 +57,7 @@ RSPermissionMatrixWidget::RSPermissionMatrixWidget(QWidget *parent)
   :QFrame(parent)
 {
   _painter = new QPainter();
+  _current_service_id = 0;
 
   setMouseTracking(true) ;