[mutt] 01/01: neomutt-devel/866366-index_format-corruption.patch to fix a problem between index_format and the nested-if patch (Closes: 866366).

[Antonio Radici]

This is an automated email from the git hooks/post-receive script.

antonio pushed a commit to branch master
in repository mutt.

commit c3b223d2c2f88ffac4a1b0dea80a332ec475575b
Author: Antonio Radici <antonio at debian.org>
Date:   Fri Jun 30 23:11:57 2017 +0100

    neomutt-devel/866366-index_format-corruption.patch to fix a problem between index_format and the nested-if patch (Closes: 866366).
---
 debian/changelog                                   |  2 +
 .../866366-index_format-corruption.patch           | 50 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 53 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ad94886..1bb1e10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mutt (1.8.3+neomutt20170609-3) UNRELEASED; urgency=medium
   * debian/patches:
     + upstream/865822-restore-defaults.patch updated so that the debug file is
       correctly named and initialized.
+    + neomutt-devel/866366-index_format-corruption.patch to fix a problem
+      between index_format and the nested-if patch (Closes: 866366).
   * debian/control:
     + ensure correct attribution to the mutt source code for the sidebar and
       the compressed folder features.
diff --git a/debian/patches/neomutt-devel/866366-index_format-corruption.patch b/debian/patches/neomutt-devel/866366-index_format-corruption.patch
new file mode 100644
index 0000000..c453135
--- /dev/null
+++ b/debian/patches/neomutt-devel/866366-index_format-corruption.patch
@@ -0,0 +1,50 @@
+commit fd852e5556dc6c9194d5e72acce734321defe2f8
+Author: Richard Russon <rich at flatcap.org>
+Date:   Thu Jun 29 13:28:58 2017 +0100
+
+    fix the padding expando '%>'
+    
+    Debian BTS 866366
+    
+    The non-greedy '%>' has been broken since the introduction of the
+    nested-if patch.
+    
+    The second command should create a line of dots ending in a ']'
+    
+        set index_format="%?M?collapsed%|.]&expanded?
+        set index_format="%?M?collapsed%>.]&expanded?
+
+--- a/muttlib.c
++++ b/muttlib.c
+@@ -1527,6 +1527,15 @@
+         lrbalance = 1;
+         while ((lrbalance > 0) && (count < sizeof(ifstring)) && *src)
+         {
++          if ((src[0] == '%') && (src[1] == '>'))
++          {
++            /* This is a padding expando; copy two chars and carry on */
++            *cp++ = *src++;
++            *cp++ = *src++;
++            count += 2;
++            continue;
++          }
++
+           if (*src == '\\')
+           {
+             src++;
+@@ -1556,6 +1565,15 @@
+         count = 0;
+         while ((lrbalance > 0) && (count < sizeof(elsestring)) && *src)
+         {
++          if ((src[0] == '%') && (src[1] == '>'))
++          {
++            /* This is a padding expando; copy two chars and carry on */
++            *cp++ = *src++;
++            *cp++ = *src++;
++            count += 2;
++            continue;
++          }
++
+           if (*src == '\\')
+           {
+             src++;
diff --git a/debian/patches/series b/debian/patches/series
index ef29347..e74e2db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ upstream/749483-conststrings.patch
 upstream/fix_doc_builddir.patch
 upstream/fix_spelling_error.patch
 upstream/865822-restore-defaults.patch
+neomutt-devel/866366-index_format-corruption.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git