Version 1.9.1

(cherry picked from commit cf51849ac5d708d8133fc2423da75bfd2b7c4298)

ChangeLog.adoc

@@ -15,6 +15,15 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 (file _ReleaseNotes.adoc_ in sources).
 
 
+[[v1.9.1]]
+== Version 1.9.1 (2017-09-23)
+
+Bug fixes::
+
+  * buflist: fix crash in auto-scroll of bar when the buflist item is not the first item in the bar
+  * logger: call strftime before replacing buffer local variables
+  * relay: fix send of "PART" command in backlog (irc protocol)
+
 [[v1.9]]
 == Version 1.9 (2017-06-25)
 

ReleaseNotes.adoc

@@ -17,6 +17,11 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
 (file _ChangeLog.adoc_ in sources).
 
 
+[[v1.9.1]]
+== Version 1.9.1 (2017-09-23)
+
+Bug fix and maintenance release.
+
 [[v1.9]]
 == Version 1.9 (2017-06-25)
 

src/plugins/buflist/buflist-bar-item.c

@@ -104,8 +104,11 @@ buflist_bar_item_bar_can_scroll (struct t_gui_bar *bar)
     if (!items_subcount || (items_subcount[0] <= 0))
         return 0;
     items_name = weechat_hdata_pointer (buflist_hdata_bar, bar, "items_name");
-    if (!items_name || (strcmp (items_name[0][0], BUFLIST_BAR_ITEM_NAME) != 0))
+    if (!items_name || !items_name[0] || !items_name[0][0]
+        || (strcmp (items_name[0][0], BUFLIST_BAR_ITEM_NAME) != 0))
+    {
         return 0;
+    }
 
     /* OK, bar can be scrolled! */
     return 1;

src/plugins/logger/logger.c

@@ -295,71 +295,71 @@ logger_get_mask_for_buffer (struct t_gui_buffer *buffer)
 char *
 logger_get_mask_expanded (struct t_gui_buffer *buffer, const char *mask)
 {
-    char *mask2, *mask_decoded, *mask_decoded2, *mask_decoded3, *mask_decoded4;
+    char *mask2, *mask3, *mask4, *mask5, *mask6, *mask7;
-    char *mask_decoded5;
     const char *dir_separator;
     int length;
     time_t seconds;
     struct tm *date_tmp;
 
     mask2 = NULL;
-    mask_decoded = NULL;
+    mask3 = NULL;
-    mask_decoded2 = NULL;
+    mask4 = NULL;
-    mask_decoded3 = NULL;
+    mask5 = NULL;
-    mask_decoded4 = NULL;
+    mask6 = NULL;
-    mask_decoded5 = NULL;
+    mask7 = NULL;
 
     dir_separator = weechat_info_get ("dir_separator", "");
     if (!dir_separator)
         return NULL;
 
+    /* replace date/time specifiers in mask */
+    length = strlen (mask) + 256 + 1;
+    mask2 = malloc (length);
+    if (!mask2)
+        goto end;
+    seconds = time (NULL);
+    date_tmp = localtime (&seconds);
+    mask2[0] = '\0';
+    if (strftime (mask2, length - 1, mask, date_tmp) == 0)
+        mask2[0] = '\0';
+
     /*
      * we first replace directory separator (commonly '/') by \01 because
      * buffer mask can contain this char, and will be replaced by replacement
      * char ('_' by default)
      */
-    mask2 = weechat_string_replace (mask, dir_separator, "\01");
+    mask3 = weechat_string_replace (mask2, dir_separator, "\01");
-    if (!mask2)
+    if (!mask3)
         goto end;
 
-    mask_decoded = weechat_buffer_string_replace_local_var (buffer, mask2);
+    mask4 = weechat_buffer_string_replace_local_var (buffer, mask3);
-    if (!mask_decoded)
+    if (!mask4)
         goto end;
 
-    mask_decoded2 = weechat_string_replace (mask_decoded,
+    mask5 = weechat_string_replace (mask4,
-                                            dir_separator,
+                                    dir_separator,
-                                            weechat_config_string (logger_config_file_replacement_char));
+                                    weechat_config_string (logger_config_file_replacement_char));
-    if (!mask_decoded2)
+    if (!mask5)
         goto end;
 
 #ifdef __CYGWIN__
-    mask_decoded3 = weechat_string_replace (mask_decoded2, "\\",
+    mask6 = weechat_string_replace (mask5, "\\",
-                                            weechat_config_string (logger_config_file_replacement_char));
+                                    weechat_config_string (logger_config_file_replacement_char));
 #else
-    mask_decoded3 = strdup (mask_decoded2);
+    mask6 = strdup (mask5);
 #endif /* __CYGWIN__ */
-    if (!mask_decoded3)
+    if (!mask6)
         goto end;
 
     /* restore directory separator */
-    mask_decoded4 = weechat_string_replace (mask_decoded3,
+    mask7 = weechat_string_replace (mask6,
-                                            "\01", dir_separator);
+                                    "\01", dir_separator);
-    if (!mask_decoded4)
+    if (!mask7)
         goto end;
 
-    /* replace date/time specifiers in mask */
-    length = strlen (mask_decoded4) + 256 + 1;
-    mask_decoded5 = malloc (length);
-    if (!mask_decoded5)
-        goto end;
-    seconds = time (NULL);
-    date_tmp = localtime (&seconds);
-    mask_decoded5[0] = '\0';
-    strftime (mask_decoded5, length - 1, mask_decoded4, date_tmp);
-
     /* convert to lower case? */
     if (weechat_config_boolean (logger_config_file_name_lower_case))
-        weechat_string_tolower (mask_decoded5);
+        weechat_string_tolower (mask7);
 
     if (weechat_logger_plugin->debug)
     {
@@ -368,22 +368,22 @@ logger_get_mask_expanded (struct t_gui_buffer *buffer, const char *mask)
                                   "decoded mask = \"%s\"",
                                   LOGGER_PLUGIN_NAME,
                                   weechat_buffer_get_string (buffer, "name"),
-                                  mask, mask_decoded5);
+                                  mask, mask7);
     }
 
 end:
     if (mask2)
         free (mask2);
-    if (mask_decoded)
+    if (mask3)
-        free (mask_decoded);
+        free (mask3);
-    if (mask_decoded2)
+    if (mask4)
-        free (mask_decoded2);
+        free (mask4);
-    if (mask_decoded3)
+    if (mask5)
-        free (mask_decoded3);
+        free (mask5);
-    if (mask_decoded4)
+    if (mask6)
-        free (mask_decoded4);
+        free (mask6);
 
-    return mask_decoded5;
+    return mask7;
 }
 
 /*

src/plugins/relay/irc/relay-irc.c

@@ -906,6 +906,7 @@ relay_irc_send_channel_backlog (struct t_relay_client *client,
                                      (ptr_host) ? "!" : "",
                                      (ptr_host) ? ptr_host : "",
                                      channel);
+                    break;
                 case RELAY_IRC_CMD_QUIT:
                     relay_irc_sendf (client,
                                      "%s:%s%s%s QUIT",

version.sh

@@ -32,9 +32,9 @@
 #     devel-patch  the patch version of devel (e.g. 2 for version 1.4.2)
 #
 
-WEECHAT_STABLE=1.9
+WEECHAT_STABLE=1.9.1
-WEECHAT_DEVEL=1.9
+WEECHAT_DEVEL=1.9.1
-WEECHAT_DEVEL_FULL=1.9
+WEECHAT_DEVEL_FULL=1.9.1
 
 if [ $# -lt 1 ]; then
     echo >&2 "Syntax: $0 stable|devel|devel-full|devel-major|devel-minor|devel-patch"

weechat.spec

@@ -23,7 +23,7 @@
 #
 
 %define name weechat
-%define version 1.9
+%define version 1.9.1
 %define release 1
 
 Name:      %{name}
@@ -77,6 +77,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/share/icons/hicolor/32x32/apps/weechat.png
 
 %changelog
+* Sat Sep 23 2017 Sébastien Helleu <flashcode@flashtux.org> 1.9.1-1
+- Released version 1.9.1
 * Sun Jun 25 2017 Sébastien Helleu <flashcode@flashtux.org> 1.9-1
 - Released version 1.9
 * Sat May 13 2017 Sébastien Helleu <flashcode@flashtux.org> 1.8-1