Version 4.2.3

ChangeLog.adoc

@@ -10,6 +10,15 @@ This document lists all the changes for each version. +
 For a list of important changes that require manual actions, please look at release notes.
 
 
+[[v4.2.3]]
+== Version 4.2.3 (2024-05-31)
+
+Bug fixes::
+
+  * xfer: fix send of data on the DCC chat buffer after `/upgrade` if the buffer was opened before the upgrade (issue #2092)
+  * irc: fix crash in split of IRC message containing a newline if the server is not given
+  * core, relay: fix include directory of libzstd
+
 [[v4.2.2]]
 == Version 4.2.2 (2024-04-07)
 

ReleaseNotes.adoc

@@ -11,6 +11,11 @@ It is recommended to read it when upgrading to a new stable version. +
 For a complete list of changes, please look at ChangeLog.
 
 
+[[v4.2.3]]
+== Version 4.2.3 (2024-05-31)
+
+No release notes.
+
 [[v4.2.2]]
 == Version 4.2.2 (2024-04-07)
 

src/core/CMakeLists.txt

@@ -92,7 +92,7 @@ include_directories(${GNUTLS_INCLUDE_PATH})
 include_directories(${CURL_INCLUDE_DIRS})
 
 if(ENABLE_ZSTD)
-  include_directories(${ZSTD_INCLUDE_DIRS})
+  include_directories(${LIBZSTD_INCLUDE_DIRS})
 endif()
 
 include_directories("${CMAKE_BINARY_DIR}")

src/plugins/irc/irc-message.c

@@ -1683,8 +1683,9 @@ irc_message_split (struct t_irc_server *server, const char *message)
     }
 
     multiline = (
-        ((weechat_strcasecmp (command, "privmsg") == 0)
-         || (weechat_strcasecmp (command, "notice") == 0))
+        server
+        && ((weechat_strcasecmp (command, "privmsg") == 0)
+            || (weechat_strcasecmp (command, "notice") == 0))
         && message
         && strchr (message, '\n')
         && (index_args + 1 <= argc - 1)

src/plugins/relay/CMakeLists.txt

@@ -51,7 +51,7 @@ list(APPEND LINK_LIBS ${GCRYPT_LDFLAGS})
 list(APPEND LINK_LIBS ${ZLIB_LIBRARY})
 
 if(ENABLE_ZSTD)
-  include_directories(${ZSTD_INCLUDE_DIRS})
+  include_directories(${LIBZSTD_INCLUDE_DIRS})
   list(APPEND LINK_LIBS ${LIBZSTD_LDFLAGS})
 endif()
 

src/plugins/xfer/xfer-chat.h

@@ -22,6 +22,11 @@
 
 extern void xfer_chat_sendf (struct t_xfer *xfer, const char *format, ...);
 extern int xfer_chat_recv_cb (const void *pointer, void *data, int fd);
+extern int xfer_chat_buffer_input_cb (const void *pointer, void *data,
+                                      struct t_gui_buffer *buffer,
+                                      const char *input_data);
+extern int xfer_chat_buffer_close_cb (const void *pointer, void *data,
+                                      struct t_gui_buffer *buffer);
 extern void xfer_chat_open_buffer (struct t_xfer *xfer);
 
 #endif /* WEECHAT_PLUGIN_XFER_CHAT_H */

src/plugins/xfer/xfer-upgrade.c

@@ -26,6 +26,7 @@
 #include "xfer.h"
 #include "xfer-upgrade.h"
 #include "xfer-buffer.h"
+#include "xfer-chat.h"
 
 
 /*
@@ -80,6 +81,7 @@ xfer_upgrade_set_buffer_callbacks ()
 {
     struct t_infolist *infolist;
     struct t_gui_buffer *ptr_buffer;
+    const char *type;
 
     infolist = weechat_infolist_get ("buffer", NULL, NULL);
     if (infolist)
@@ -89,12 +91,22 @@ xfer_upgrade_set_buffer_callbacks ()
             if (weechat_infolist_pointer (infolist, "plugin") == weechat_xfer_plugin)
             {
                 ptr_buffer = weechat_infolist_pointer (infolist, "pointer");
-                weechat_buffer_set_pointer (ptr_buffer, "close_callback", &xfer_buffer_close_cb);
-                weechat_buffer_set_pointer (ptr_buffer, "input_callback", &xfer_buffer_input_cb);
+                type = weechat_buffer_get_string (ptr_buffer, "localvar_type");
                 if (strcmp (weechat_infolist_string (infolist, "name"),
                             XFER_BUFFER_NAME) == 0)
                 {
                     xfer_buffer = ptr_buffer;
+                    weechat_buffer_set_pointer (
+                        ptr_buffer, "close_callback", &xfer_buffer_close_cb);
+                    weechat_buffer_set_pointer (
+                        ptr_buffer, "input_callback", &xfer_buffer_input_cb);
+                }
+                else if (type && (strcmp (type, "private") == 0))
+                {
+                    weechat_buffer_set_pointer (
+                        ptr_buffer, "close_callback", &xfer_chat_buffer_close_cb);
+                    weechat_buffer_set_pointer (
+                        ptr_buffer, "input_callback", &xfer_chat_buffer_input_cb);
                 }
             }
         }

tests/unit/plugins/irc/test-irc-message.cpp

@@ -1997,6 +1997,21 @@ TEST(IrcMessage, Split)
     hashtable_remove (server->cap_list, "batch");
     hashtable_remove (server->cap_list, "draft/multiline");
 
+    /* PRIVMSG with newlines but no server: BATCH is not used */
+    hashtable = irc_message_split (NULL, "PRIVMSG #channel :test\n\nline 3");
+    CHECK(hashtable);
+    LONGS_EQUAL(7, hashtable->items_count);
+    STRCMP_EQUAL("3", (const char *)hashtable_get (hashtable, "count"));
+    STRCMP_EQUAL("PRIVMSG #channel :test",
+                 (const char *)hashtable_get (hashtable, "msg1"));
+    STRCMP_EQUAL("test", (const char *)hashtable_get (hashtable, "args1"));
+    STRCMP_EQUAL("PRIVMSG #channel :",
+                 (const char *)hashtable_get (hashtable, "msg2"));
+    STRCMP_EQUAL("", (const char *)hashtable_get (hashtable, "args2"));
+    STRCMP_EQUAL("PRIVMSG #channel :line 3",
+                 (const char *)hashtable_get (hashtable, "msg3"));
+    STRCMP_EQUAL("line 3", (const char *)hashtable_get (hashtable, "args3"));
+
     /* 005: no split */
     hashtable = irc_message_split (server, "005 nick " MSG_005);
     CHECK(hashtable);

version.sh

@@ -39,8 +39,8 @@
 #     devel-number   the devel version as hex number ("0x04010000" for "4.1.0-dev")
 #
 
-weechat_stable="4.2.2"
-weechat_devel="4.2.2"
+weechat_stable="4.2.3"
+weechat_devel="4.2.3"
 
 stable_major=$(echo "${weechat_stable}" | cut -d"." -f1)
 stable_minor=$(echo "${weechat_stable}" | cut -d"." -f2)