fix buffer issue on group images (should fix decoding problems)

Author: zoff99

src/core/core.cpp

@@ -913,8 +913,9 @@ void Core::onNgcGroupCustomPacket(Tox* tox, uint32_t group_number, uint32_t peer
             {
                 // HINT: ok we have a group file
                 auto peerPk = core->getGroupPeerPk((Settings::NGC_GROUPNUM_OFFSET + group_number), peer_id);
+                QByteArray image_data_bytes = QByteArray(reinterpret_cast<const char*>(data + header_len), (length - header_len));
                 emit core->groupMessageReceivedImage((Settings::NGC_GROUPNUM_OFFSET + group_number),
-                    peer_id, (data + header_len),
+                    peer_id, image_data_bytes,
                     (length - header_len), false,
                     static_cast<int>(Widget::MessageHasIdType::NGC_MSG_ID));
             }

src/core/core.h

@@ -187,7 +187,7 @@ public slots:
     void emptyGroupCreated(int groupnumber, const GroupId groupId, const QString& title = QString());
     void groupInviteReceived(const GroupInvite& inviteInfo);
     void groupMessageReceived(int groupnumber, int peernumber, const QString& message, bool isAction, bool isPrivate = false, const int hasIdType = 0);
-    void groupMessageReceivedImage(int groupnumber, int peernumber, const uint8_t *data, size_t length, bool isAction, const int hasIdType = 0);
+    void groupMessageReceivedImage(int groupnumber, int peernumber, const QByteArray& image_bytes, size_t length, bool isAction, const int hasIdType = 0);
     void groupSyncHistoryReqReceived(int groupnumber, int peernumber, ToxPk peerPk);
     void groupNamelistChanged(int groupnumber, int peernumber, uint8_t change);
     void groupPeerlistChanged(int groupnumber);

src/widget/widget.cpp

@@ -22,6 +22,7 @@
 #include <cassert>
 
 #include <QClipboard>
+#include <QCryptographicHash>
 #include <QDebug>
 #include <QDesktopServices>
 #include <QDesktopWidget>
@@ -2073,7 +2074,7 @@ void Widget::onGroupMessageReceived(int groupnumber, int peernumber, const QStri
     groupMessageDispatchers[groupId]->onMessageReceived(author, isAction, isPrivate, message, hasIdType);
 }
 
-void Widget::onGroupMessageReceivedImage(int groupnumber, int peernumber, const uint8_t *image_data,
+void Widget::onGroupMessageReceivedImage(int groupnumber, int peernumber, const QByteArray& image_bytes,
                                     size_t length, bool isAction, const int hasIdType)
 {
     const GroupId& groupId = groupList->id2Key(groupnumber);
@@ -2084,25 +2085,28 @@ void Widget::onGroupMessageReceivedImage(int groupnumber, int peernumber, const
     std::ignore = isAction;
     std::ignore = hasIdType;
 
-    QByteArray image_data_bytes = QByteArray(reinterpret_cast<const char*>(image_data), length);
-    // qDebug() << "onGroupMessageReceivedImage:image_data_bytes:"
-    //    << QString::fromUtf8(image_data_bytes.toHex()).toUpper().rightJustified((length * 2), '0')
+    QByteArray shaBa = QCryptographicHash::hash(image_bytes, QCryptographicHash::Sha256);
+    QString sha256hash = QString::fromUtf8(shaBa.toHex()).toUpper();
+    qDebug() << "onGroupMessageReceivedImage:SHA256:" << sha256hash << "length" << length;
+
+    // qDebug() << "onGroupMessageReceivedImage:image_bytes:"
+    //    << QString::fromUtf8(image_bytes.toHex()).toUpper().rightJustified((length * 2), '0')
     //        << "len:" << length;
 
     QPixmap mpixmap;
-    bool result = mpixmap.loadFromData(image_data_bytes);
+    bool result = mpixmap.loadFromData(image_bytes);
     if (!result)
     {
         qDebug() << "onGroupMessageReceivedImage:loadFromData:trying with hardcoded WEBP type";
-        result = mpixmap.loadFromData(image_data_bytes, "WEBP");
+        result = mpixmap.loadFromData(image_bytes, "WEBP");
     }
     qDebug() << "onGroupMessageReceivedImage:loadFromData:res=" << result;
 
     //if (result)
     //{
         // HINT: image could be loaded OK, so save hex data into DB
         //       add message even if image could not be loaded
-        QString message = QString::fromUtf8(image_data_bytes.toHex()).toUpper().rightJustified((length * 2), '0') + QString(":") + QString("___");
+        QString message = QString::fromUtf8(image_bytes.toHex()).toUpper().rightJustified((length * 2), '0') + QString(":") + QString("___");
         groupMessageDispatchers[groupId]->onMessageReceived(author, isAction, false, message, hasIdType);
     //}
 }

src/widget/widget.h

@@ -207,7 +207,7 @@ public slots:
     void onGroupInviteReceived(const GroupInvite& inviteInfo);
     void onGroupInviteAccepted(const GroupInvite& inviteInfo);
     void onGroupMessageReceived(int groupnumber, int peernumber, const QString& message, bool isAction, bool isPrivate = false, const int hasIdType = 0);
-    void onGroupMessageReceivedImage(int groupnumber, int peernumber, const uint8_t *image_data, size_t length, bool isAction, const int hasIdType = 0);
+    void onGroupMessageReceivedImage(int groupnumber, int peernumber, const QByteArray& image_bytes, size_t length, bool isAction, const int hasIdType = 0);
     void onGroupSyncHistoryReqReceived(int groupnumber, int peernumber, ToxPk peerPk);
     void onGroupPeerlistChanged(uint32_t groupnumber);
     void onGroupPeerNameChanged(uint32_t groupnumber, const ToxPk& peerPk, const QString& newName);