From unknown Fri Aug 15 20:26:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#24210: diff3 in diffutils 3.4 is broken Resent-From: Bastian Beischer Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Fri, 12 Aug 2016 14:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 24210 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: 24210@debbugs.gnu.org X-Debbugs-Original-To: bug-diffutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.14710117477694 (code B ref -1); Fri, 12 Aug 2016 14:23:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Aug 2016 14:22:27 +0000 Received: from localhost ([127.0.0.1]:55268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bYDLv-000202-JT for submit@debbugs.gnu.org; Fri, 12 Aug 2016 10:22:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bYDLt-0001zp-OO for submit@debbugs.gnu.org; Fri, 12 Aug 2016 10:22:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bYDLl-0002xm-45 for submit@debbugs.gnu.org; Fri, 12 Aug 2016 10:22:19 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:57514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bYDLk-0002xR-UK for submit@debbugs.gnu.org; Fri, 12 Aug 2016 10:22:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bYDLe-0005XO-2o for bug-diffutils@gnu.org; Fri, 12 Aug 2016 10:22:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bYDLX-0002mG-9S for bug-diffutils@gnu.org; Fri, 12 Aug 2016 10:22:08 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:34035) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bYDLX-0002kp-1f for bug-diffutils@gnu.org; Fri, 12 Aug 2016 10:22:03 -0400 Received: by mail-wm0-x242.google.com with SMTP id q128so3137746wma.1 for ; Fri, 12 Aug 2016 07:22:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:from:date:message-id:subject:to; bh=aedQ9YhG+oKGWYpUlx+9l/Ig+3sICg/9nMU7xU4arOs=; b=t3/G7sX+EQu4SRwhu7BzkyTFY+CIaf8N9M5Zn64BsGtWKzyBKvs2jxnROvIgW4nATm Naj4CypFSxZY3kmKwXjRch10jV1h2sBM4a40GM7lCNd6cYcZoWTgRtrR7ybfLEJlfMf+ AUWqiGtI0zSh1mDMnUlaFm763Tg0rosXMiJ0SxUtRoBa4YZBWR7/EJmB0qiTXx4YPpAs vPqrbkfa/GDKu7UacOZhHjiZKmeRrkY3bODvHfI1o9xq6x90bKuygH3R15+7zSsFGLYe yoJMpxAt6DTGMgOvXNzFbU3fozeLGSEcOk7mI+6pN0FBqJUNRvofNEVVP8tnXTbVj57B 6GzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=aedQ9YhG+oKGWYpUlx+9l/Ig+3sICg/9nMU7xU4arOs=; b=LdKpJSvpglQFVsrs0gank7yDxPKuoF8qdE7YdC7bIAVNX9cth2RMD8QEO/hbfG8Xa+ qFHURB0qsA2ZvKSjrN7M/3ZEhi8WDdNcnPdTOE0CNCZTgB3C3fTIy4mpBtohbb3dL8Qq 6/Tnq+32Tf4vFaNNd0L/BlsNgai+XG6o35pgniv65/o2LegtZjH3h4kZ9BP96GCzVlgc behNql83d0C476JWxorELDjRw03xq5fCLQCZH+f0D75nWbFX3d7jC32HmGnSt9AEvuWq 4se/nqDUd8KRv+FB+1HrpPALO1+AzEqiXljZsKa/FgSumZydIEmRYh+lu2eYVs4YSS8U zgoA== X-Gm-Message-State: AEkoouvkCUoCZEh2cXN6Fhn+KHuRkGVVY3PCL2xWYC5AEL9RhCBqK8eqG39upuEN6lLWATsdGwwqeEjW6NMFCA== X-Received: by 10.28.27.143 with SMTP id b137mr3733726wmb.12.1471011720800; Fri, 12 Aug 2016 07:22:00 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.152.87 with HTTP; Fri, 12 Aug 2016 07:22:00 -0700 (PDT) From: Bastian Beischer Date: Fri, 12 Aug 2016 16:22:00 +0200 X-Google-Sender-Auth: SS5cc2U6zSflg9jXavyyoMTzmpE Message-ID: Content-Type: text/plain; charset=UTF-8 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) Hello, Please try to run diff3 from diffutils 3.4 as follows: echo a > a.txt echo b > b.txt echo c > c.txt diff3 a.txt b.txt c.txt Expected output (with diff3 from diffutils 3.3): ==== 1:1c a 2:1c b 3:1c c Actual output (with diff3 from diffutils 3.4): ====3 1:1c 2:1c a 3:1c c There was only one commit in src/diff3.c between 3.3 and 3.4: http://git.savannah.gnu.org/cgit/diffutils.git/commit/src?id=3b74a905c5460e7979c53273ac90345860d001a7 Reverting this commit fixes the issue. Best Bastian -- Bastian Beischer RWTH Aachen University of Technology @RWTH Aachen Office: 28 C 203 Phone: +49-241-80-27205 E-mail: beischer@physik.rwth-aachen.de Address: I. Physikalisches Institut B, Sommerfeldstr. 14, D-52074 Aachen @CERN Office: Bdg 32-4-B12 Phone: +41-22-76-75750 E-mail: bastian.beischer@cern.ch Address: CERN, CH-1211 Geneve 23 From unknown Fri Aug 15 20:26:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#24210: [bug-diffutils] bug#24210: diff3 in diffutils 3.4 is broken Resent-From: Jim Meyering Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Fri, 12 Aug 2016 16:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24210 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: Bastian Beischer Cc: 24210@debbugs.gnu.org Received: via spool by 24210-submit@debbugs.gnu.org id=B24210.14710197556813 (code B ref 24210); Fri, 12 Aug 2016 16:36:01 +0000 Received: (at 24210) by debbugs.gnu.org; 12 Aug 2016 16:35:55 +0000 Received: from localhost ([127.0.0.1]:55351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bYFR5-0001lo-D1 for submit@debbugs.gnu.org; Fri, 12 Aug 2016 12:35:55 -0400 Received: from mail-oi0-f67.google.com ([209.85.218.67]:32852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bYFR3-0001lZ-DI for 24210@debbugs.gnu.org; Fri, 12 Aug 2016 12:35:53 -0400 Received: by mail-oi0-f67.google.com with SMTP id s207so2482963oie.0 for <24210@debbugs.gnu.org>; Fri, 12 Aug 2016 09:35:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=a44mqstyaNsypUpmGCIpZdbnk9nK51ANp8c4pR6UXsg=; b=F/DmDIm7ZQ50U5qX14jWjICBIIiQRlc7a4zXWnIDigxigIffoLsaCeXy+JTtuhuCFo VVAM3e2FztFFGC+ZsDw4BOUZjlmJj8lw6zs5ftdIxQTSyGi4xBvrqGUzsljR0Hg2QWN7 4kapmUamVgotr2tFF8IkRXinTR7ne2ShSlfgpzJA8Zvq4m0eGL4dSoYOPKLThXKS5Qvy 4yf7Sbb07rjE/XnEsl4x2B3ACru23c/lwRHXqepo12/JuuUD+anMSC8+C/GNkYzB9VQm 1b5XyueFoOtVbVoTbKdzX21lNcW1NIRe1h02QFTkDlTm6kRaJeOiOros5D4hfmuxtgA9 0YUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=a44mqstyaNsypUpmGCIpZdbnk9nK51ANp8c4pR6UXsg=; b=kIBXQ/cZAUI/3cPJyzCXCjXmnv/Tkf8hhPAxwigRATvaeapYsdKiOyu1z+U9AGomTK j0jx8OGYfJX3AtAW7AG+/VmZezi7tYmj+Q+v8P0xTQ3nZRgoMFgpSYa7/X9mJQZ6Vvyt 3F8IPvIuje3RAWwLImgivMwocZyQ/bu8yJrr9txfj9zcKj1UlvMMpHUTy/IhqICA7kSP 2zkS5CIpG9vKqcrbeNMHCOKh0ldfzGRIDUQkMlYA75u3i2NtyIwIGVgDBjXGifQ7CJc+ I8VfCBg6KkKEGiCaqvlC61tfMkTNhSN53VOtZ5e7OrGFGG3dWyMXFyqp8thsc1/5bUmP 10UQ== X-Gm-Message-State: AEkoouuzgt9vNhSjqMEIeZBu/UZmFKO6v9qXJ90r664Jdd6Esa+QySotwvVoLMOYJbXrnxfIwyBiTQQD6yDctQ== X-Received: by 10.157.52.7 with SMTP id v7mr5459134otb.125.1471019747798; Fri, 12 Aug 2016 09:35:47 -0700 (PDT) MIME-Version: 1.0 Received: by 10.202.236.16 with HTTP; Fri, 12 Aug 2016 09:35:27 -0700 (PDT) In-Reply-To: References: From: Jim Meyering Date: Fri, 12 Aug 2016 09:35:27 -0700 X-Google-Sender-Auth: tzGJaiE0TBZqqltZVJYPP-9Bbr8 Message-ID: Content-Type: text/plain; charset=UTF-8 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On Fri, Aug 12, 2016 at 7:22 AM, Bastian Beischer wrote: > Hello, > > Please try to run diff3 from diffutils 3.4 as follows: > > echo a > a.txt > echo b > b.txt > echo c > c.txt > diff3 a.txt b.txt c.txt > > Expected output (with diff3 from diffutils 3.3): > > ==== > 1:1c > a > 2:1c > b > 3:1c > c > > Actual output (with diff3 from diffutils 3.4): > > ====3 > 1:1c > 2:1c > a > 3:1c > c > > There was only one commit in src/diff3.c between 3.3 and 3.4: > > http://git.savannah.gnu.org/cgit/diffutils.git/commit/src?id=3b74a905c5460e7979c53273ac90345860d001a7 > > Reverting this commit fixes the issue. Yikes. Thank you for the report. I confirm that that patch is erroneous, and will prepare a complete fix (adding your test and a NEWS entry) shortly. Looks like diffutils-3.5 will have to be released pretty soon. From unknown Fri Aug 15 20:26:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#24210: [bug-diffutils] bug#24210: bug#24210: diff3 in diffutils 3.4 is broken Resent-From: Jim Meyering Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Sun, 14 Aug 2016 05:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24210 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: Bastian Beischer Cc: 24210@debbugs.gnu.org Received: via spool by 24210-submit@debbugs.gnu.org id=B24210.14711517221544 (code B ref 24210); Sun, 14 Aug 2016 05:16:02 +0000 Received: (at 24210) by debbugs.gnu.org; 14 Aug 2016 05:15:22 +0000 Received: from localhost ([127.0.0.1]:56725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bYnlT-0000Og-O4 for submit@debbugs.gnu.org; Sun, 14 Aug 2016 01:15:22 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:36187) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bYnlQ-0000OR-MQ for 24210@debbugs.gnu.org; Sun, 14 Aug 2016 01:15:13 -0400 Received: by mail-oi0-f65.google.com with SMTP id b22so2081157oii.3 for <24210@debbugs.gnu.org>; Sat, 13 Aug 2016 22:15:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=OQ3BmjmUgbRn4rrSDOzmP/ee6nZUM0l4V+5NlamuPUk=; b=ToH1wMJmwKrYQ2hjjJ+ZbU53nnoNzCRYpqgGXH/867MvEAm7n7UUG3xjjjTcKcflvw asfmKPaF3/w03DAfucUxqGnwTIfsyA84Lfg8e3KT0ZgYuqRItWkrZY8tFSwqmGCbR9qE f3LAzMSErw3Isg+sqwsgs2AComDyjLHKX3JdQwdCKZAMHJ24cOjX3yi/NlPuQqI2/RCp um5+3HOPv3lwOI0mH6A0h1htp/OWe37qlsJY/8EmowUBvqaovvLADW84oN1ak7fHgtkx L5a68xJEsfFp0TxJXSydqc+ywKlx424XuGmbY1S0HqFUUjdBjsMa5FWNU3Fy3V/nf5po zZgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=OQ3BmjmUgbRn4rrSDOzmP/ee6nZUM0l4V+5NlamuPUk=; b=azex4oZI4m3calJ4nEV1tWedT88FLBpDGLlKWrEt68XD4xY92tGh+ni50sjdp9O6xQ EitjS45Eea+twTc+0Z3cDUiLPSG7duAMJUFN8MadpH2JNDNsBiJY19wxzHwtbR4/agNY pzfLlrcLN0X5yTZlA5y01o2DuTLizheIBGPNIioqS0TfM8W5u/8XR6eRTnLEtDIRTWV9 PTc+ql4KMSNBANt1VNdDBOmv21cBmyvdrgBOxZUxM41gd9k/34TvPfTM8q2cyqNZ0khv rZ4Mp/AkKt1DUbHAKQxHf1kaxPBQYu+Mvc0WmPcEPoSwP/yxQkiKpsGpoP2HM/BUNkTQ KQ0w== X-Gm-Message-State: AEkoouuF59tYIlADb4wFTHBISqThNjZ+HghzHXdZub+glQkHoF+QunHX6jIfQJxud/oiymYpRhwRO7WbORGNqQ== X-Received: by 10.157.52.7 with SMTP id v7mr8714890otb.125.1471151706981; Sat, 13 Aug 2016 22:15:06 -0700 (PDT) MIME-Version: 1.0 Received: by 10.202.236.16 with HTTP; Sat, 13 Aug 2016 22:14:46 -0700 (PDT) In-Reply-To: References: From: Jim Meyering Date: Sat, 13 Aug 2016 22:14:46 -0700 X-Google-Sender-Auth: 6jNvSMZutuXA4Qlb1Smjl3xO46Y Message-ID: Content-Type: multipart/mixed; boundary=001a1141549ee7ec28053a0132dd X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --001a1141549ee7ec28053a0132dd Content-Type: text/plain; charset=UTF-8 On Fri, Aug 12, 2016 at 9:35 AM, Jim Meyering wrote: > On Fri, Aug 12, 2016 at 7:22 AM, Bastian Beischer > wrote: >> Hello, >> >> Please try to run diff3 from diffutils 3.4 as follows: >> >> echo a > a.txt >> echo b > b.txt >> echo c > c.txt >> diff3 a.txt b.txt c.txt ... >> There was only one commit in src/diff3.c between 3.3 and 3.4: >> >> http://git.savannah.gnu.org/cgit/diffutils.git/commit/src?id=3b74a905c5460e7979c53273ac90345860d001a7 >> >> Reverting this commit fixes the issue. > > Yikes. > Thank you for the report. > I confirm that that patch is erroneous, and will prepare a complete > fix (adding your test and a NEWS entry) shortly. > Looks like diffutils-3.5 will have to be released pretty soon. I've reverted that, added your test case and updated NEWS with a commit in your name. Please review that first commit, in the attached. diff3: fix heap use-after-free; add minimal diff3 test coverage I have also made two other changes: maint: require that commit messages be of a certain form diff3: fix leaks, for real The first of those enforces some modicum of sanity on commit log messages, and might have prevented the offending commit. This is largely copied from what I did for coreutils. The final change actually does plug diff3's leaks. The minimal test cases did not exercise the code to handle multiple diff blocks, so I added one that does. One can argue that explicitly freeing some of those buffers is not required, so I have made it so that nearly all of the code added by this fix can be compiled out. --001a1141549ee7ec28053a0132dd Content-Type: text/plain; charset=US-ASCII; name="diff3-leak-fix.diff" Content-Disposition: attachment; filename="diff3-leak-fix.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iru5m9ir0 RnJvbSA4OGQ5MTFkYmM3MTc0OTRmZWJlZTRiMGViYzc5MDgwODA1NGZlZmZmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gTWV5ZXJpbmcgPG1leWVyaW5nQGZiLmNvbT4KRGF0ZTog U2F0LCAxMyBBdWcgMjAxNiAxOTo0MDoyMCAtMDcwMApTdWJqZWN0OiBbUEFUQ0ggMS80XSBidWls ZDogaWdub3JlIHRleGluZm8gYnVpbGQgYXJ0aWZhY3RzCgoqIC5naXRpZ25vcmU6IElnbm9yZSB0 ZXhpbmZvIGFydGlmYWN0cyBpbiBkb2MvLgotLS0KIC5naXRpZ25vcmUgfCA2ICsrKysrLQogMSBm aWxlIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBh Ly5naXRpZ25vcmUgYi8uZ2l0aWdub3JlCmluZGV4IGJmMTEzMTIuLjNmZWNhY2UgMTAwNjQ0Ci0t LSBhLy5naXRpZ25vcmUKKysrIGIvLmdpdGlnbm9yZQpAQCAtMTUsMTAgKzE1LDE0IEBACiAvY29u ZmlnLmxvZwogL2NvbmZpZy5zdGF0dXMKIC9jb25maWd1cmUKLS9kaWZmdXRpbHMtKi50YXIuZ3oK IC9kaWZmdXRpbHMtKi50YXIueHoKIC9kb2MvLmdpdGlnbm9yZQorL2RvYy9kaWZmdXRpbHMuYXV4 CisvZG9jL2RpZmZ1dGlscy5jcAorL2RvYy9kaWZmdXRpbHMuY3BzCiAvZG9jL2RpZmZ1dGlscy5p bmZvCisvZG9jL2RpZmZ1dGlscy5sb2cKKy9kb2MvZGlmZnV0aWxzLnRvYwogL2RvYy9zdGFtcC12 dGkKIC9kb2MvdmVyc2lvbi50ZXhpCiAvZ251bGliLXRlc3RzCi0tIAoyLjcuNAoKCkZyb20gMWEw ZGY0Mzk2ZWJlM2I5YTU4Yjg4MmJiOTc2Y2ZjZTNmNTBkM2NhYyBNb24gU2VwIDE3IDAwOjAwOjAw IDIwMDEKRnJvbTogQmFzdGlhbiBCZWlzY2hlciA8YmFzdGlhbi5iZWlzY2hlckByd3RoLWFhY2hl bi5kZT4KRGF0ZTogU2F0LCAxMyBBdWcgMjAxNiAxODo1MzozNiAtMDcwMApTdWJqZWN0OiBbUEFU Q0ggMi80XSBkaWZmMzogZml4IGhlYXAgdXNlLWFmdGVyLWZyZWU7IGFkZCBtaW5pbWFsIGRpZmYz IHRlc3QKIGNvdmVyYWdlCgpDb21taXQgdjMuMy00Mi1nM2I3NGE5MCwgIkZJWE1FOiBzcmMvZGlm ZjM6IHBsdWcgYSBsZWFrIiBhZGRlZCBhbgppbnZhbGlkIHVzZSBvZiBmcmVlLCBsZWFkaW5nIHRv IHVzZS1hZnRlci1mcmVlIGluIG5lYXJseSBhbnkgaW52b2NhdGlvbgpvZiBkaWZmMy4gIFJldmVy dCB0aGF0IGNvbW1pdC4KKiBORVdTIChCdWcgZml4ZXMpOiBNZW50aW9uIGl0LgoqIHRlc3RzL2Rp ZmYzOiBOZXcgZmlsZSwgdG8gYWRkIG1pbmltYWwgdGVzdCBjb3ZlcmFnZS4KKiB0ZXN0cy9NYWtl ZmlsZS5hbSAoVEVTVFMpOiBBZGQgaXQuClJlcG9ydGVkIGJ5IEJhc3RpYW4gQmVpc2NoZXIgaW4g aHR0cDovL2J1Z3MuZ251Lm9yZy8yNDIxMAotLS0KIE5FV1MgICAgICAgICAgICAgIHwgIDMgKysr CiBzcmMvZGlmZjMuYyAgICAgICB8ICAxIC0KIHRlc3RzL01ha2VmaWxlLmFtIHwgIDEgKwogdGVz dHMvZGlmZjMgICAgICAgfCAzMCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDQgZmls ZXMgY2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQogY3JlYXRlIG1vZGUg MTAwNjQ0IHRlc3RzL2RpZmYzCgpkaWZmIC0tZ2l0IGEvTkVXUyBiL05FV1MKaW5kZXggOWE4ZDJl MS4uNzNmZjgzYiAxMDA2NDQKLS0tIGEvTkVXUworKysgYi9ORVdTCkBAIC00LDYgKzQsOSBAQCBH TlUgZGlmZnV0aWxzIE5FV1MgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAtKi0g b3V0bGluZSAtKi0KCiAqKiBCdWcgZml4ZXMKCisgIGRpZmYzIG5vIGxvbmdlciBtYWxmdW5jdGlv bnMgZHVlIHRvIHVzZS1hZnRlci1mcmVlCisgIFtidWcgaW50cm9kdWNlZCBpbiAzLjRdCisKICAg ZGlmZiAtLWNvbG9yIG5vIGxvbmdlciBjb2xvcml6ZXMgd2hlbiBURVJNPWR1bWIKCgpkaWZmIC0t Z2l0IGEvc3JjL2RpZmYzLmMgYi9zcmMvZGlmZjMuYwppbmRleCA2ZWY5MGY0Li4wZWI2NDNlIDEw MDY0NAotLS0gYS9zcmMvZGlmZjMuYworKysgYi9zcmMvZGlmZjMuYwpAQCAtMTAzOSw3ICsxMDM5 LDYgQEAgcHJvY2Vzc19kaWZmIChjaGFyIGNvbnN0ICpmaWxlYSwKCiAgICpibG9ja19saXN0X2Vu ZCA9IE5VTEw7CiAgICpsYXN0X2Jsb2NrID0gYnB0cjsKLSAgZnJlZSAoZGlmZl9jb250ZW50cyk7 CiAgIHJldHVybiBibG9ja19saXN0OwogfQoKZGlmZiAtLWdpdCBhL3Rlc3RzL01ha2VmaWxlLmFt IGIvdGVzdHMvTWFrZWZpbGUuYW0KaW5kZXggNzdkOWZjMy4uNjZlMjVhNSAxMDA2NDQKLS0tIGEv dGVzdHMvTWFrZWZpbGUuYW0KKysrIGIvdGVzdHMvTWFrZWZpbGUuYW0KQEAgLTYsNiArNiw3IEBA IFRFU1RTID0gXAogICBiaW5hcnkgXAogICBicmllZi12cy1zdGF0LXplcm8ta2VybmVsLWxpZXMg XAogICBjb2xsaWRpbmctZmlsZS1uYW1lcyBcCisgIGRpZmYzIFwKICAgZXhjZXNzLXNsYXNoIFwK ICAgaGVscC12ZXJzaW9uCVwKICAgZnVuY3Rpb24tbGluZS12cy1sZWFkaW5nLXNwYWNlIFwKZGlm ZiAtLWdpdCBhL3Rlc3RzL2RpZmYzIGIvdGVzdHMvZGlmZjMKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMC4uYTFmYzI4NwotLS0gL2Rldi9udWxsCisrKyBiL3Rlc3RzL2RpZmYzCkBA IC0wLDAgKzEsMzAgQEAKKyMhL2Jpbi9zaAorIyBUaGlzIHdvdWxkIG1hbGZ1bmN0aW9uIGluIGRp ZmYtMy40CisKKy4gIiR7c3JjZGlyPS59L2luaXQuc2giOyBwYXRoX3ByZXBlbmRfIC4uL3NyYwor CitlY2hvIGEgPiBhIHx8IGZyYW1ld29ya19mYWlsdXJlXworZWNobyBiID4gYiB8fCBmcmFtZXdv cmtfZmFpbHVyZV8KK2VjaG8gYyA+IGMgfHwgZnJhbWV3b3JrX2ZhaWx1cmVfCitjYXQgPDwnRU9G JyA+IGV4cCB8fCBmcmFtZXdvcmtfZmFpbHVyZV8KKz09PT0KKzE6MWMKKyAgYQorMjoxYworICBi CiszOjFjCisgIGMKK0VPRgorCitmYWlsPTAKKworZGlmZjMgYSBiIGMgPiBvdXQgMj4gZXJyIHx8 IGZhaWw9MQorY29tcGFyZSBleHAgb3V0IHx8IGZhaWw9MQorY29tcGFyZSAvZGV2L251bGwgZXJy IHx8IGZhaWw9MQorCisjIFJlcGVhdCwgYnV0IHdpdGggYWxsIHRocmVlIGZpbGVzIHRoZSBzYW1l OgorZGlmZjMgYSBhIGEgPiBvdXQgMj4gZXJyIHx8IGZhaWw9MQorY29tcGFyZSAvZGV2L251bGwg b3V0IHx8IGZhaWw9MQorY29tcGFyZSAvZGV2L251bGwgZXJyIHx8IGZhaWw9MQorCitFeGl0ICRm YWlsCi0tIAoyLjcuNAoKCkZyb20gYjNkZWY3MzhmM2I0MzVjYmU2ZjJhODQwNmJhZTVhNzExNzVh MGI4MCBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKRnJvbTogSmltIE1leWVyaW5nIDxtZXllcmlu Z0BmYi5jb20+CkRhdGU6IEZyaSwgMTIgQXVnIDIwMTYgMTE6MTc6MjYgLTA3MDAKU3ViamVjdDog W1BBVENIIDMvNF0gbWFpbnQ6IHJlcXVpcmUgdGhhdCBjb21taXQgbWVzc2FnZXMgYmUgb2YgYSBj ZXJ0YWluIGZvcm0KCiogYm9vdHN0cmFwLmNvbmYgKGJvb3RzdHJhcF9lcGlsb2d1ZSk6IE1lcmdl IGZyb20gY29yZXV0aWxzLCBzbyB0aGF0CmEgbG9jYWwgY29tbWl0IGhvb2sgd2lsbCBub3cgaGVs cCBlbmZvcmNlIGNvbnNpc3RlbnQgY29tbWl0IG1lc3NhZ2VzLgoqIE1ha2VmaWxlLmFtIChjaGVj ay1naXQtaG9vay1zY3JpcHQtc3luYyk6IE5ldyBydWxlLCBsYXJnZWx5IGNvcGllZApmcm9tIGNv cmV1dGlscy4KKiBzY3JpcHRzL2dpdC1ob29rcy9jb21taXQtbXNnOiBOZXcgZmlsZSwgZnJvbSBj b3JldXRpbHMsIGJ1dAp3aXRoIGFkYXB0ZWQgbGlzdCBvZiBwcm9ncmFtIG5hbWVzLgoqIHNjcmlw dHMvZ2l0LWhvb2tzL2FwcGx5cGF0Y2gtbXNnOiBOZXcgZmlsZSwgZnJvbSBnaXQuCiogc2NyaXB0 cy9naXQtaG9va3MvcHJlLWFwcGx5cGF0Y2g6IExpa2V3aXNlLgoqIHNjcmlwdHMvZ2l0LWhvb2tz L3ByZS1jb21taXQ6IExpa2V3aXNlLgotLS0KIE1ha2VmaWxlLmFtICAgICAgICAgICAgICAgICAg ICAgIHwgIDE0ICsrKysKIGJvb3RzdHJhcC5jb25mICAgICAgICAgICAgICAgICAgIHwgIDI1ICsr KysrKysKIHNjcmlwdHMvZ2l0LWhvb2tzL2FwcGx5cGF0Y2gtbXNnIHwgIDE1ICsrKysKIHNjcmlw dHMvZ2l0LWhvb2tzL2NvbW1pdC1tc2cgICAgIHwgMTUzICsrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKwogc2NyaXB0cy9naXQtaG9va3MvcHJlLWFwcGx5cGF0Y2ggfCAgMTQg KysrKwogc2NyaXB0cy9naXQtaG9va3MvcHJlLWNvbW1pdCAgICAgfCAgNDkgKysrKysrKysrKysr KwogNiBmaWxlcyBjaGFuZ2VkLCAyNzAgaW5zZXJ0aW9ucygrKQogY3JlYXRlIG1vZGUgMTAwNzU1 IHNjcmlwdHMvZ2l0LWhvb2tzL2FwcGx5cGF0Y2gtbXNnCiBjcmVhdGUgbW9kZSAxMDA3NTUgc2Ny aXB0cy9naXQtaG9va3MvY29tbWl0LW1zZwogY3JlYXRlIG1vZGUgMTAwNzU1IHNjcmlwdHMvZ2l0 LWhvb2tzL3ByZS1hcHBseXBhdGNoCiBjcmVhdGUgbW9kZSAxMDA3NTUgc2NyaXB0cy9naXQtaG9v a3MvcHJlLWNvbW1pdAoKZGlmZiAtLWdpdCBhL01ha2VmaWxlLmFtIGIvTWFrZWZpbGUuYW0KaW5k ZXggMjQ0MDI0ZS4uZWRlZTVmYSAxMDA2NDQKLS0tIGEvTWFrZWZpbGUuYW0KKysrIGIvTWFrZWZp bGUuYW0KQEAgLTQyLDMgKzQyLDE3IEBAIGdlbi1DaGFuZ2VMb2c6CiBBTExfUkVDVVJTSVZFX1RB UkdFVFMgKz0gZGlzdGNoZWNrLWhvb2sKIGRpc3RjaGVjay1ob29rOgogCSQoTUFLRSkgbXktZGlz dGNoZWNrCisKKyMgU29tZSBvZiBvdXIgZ2l0IGhvb2sgc2NyaXB0cyBhcmUgc3VwcG9zZWQgdG8g YmUgaWRlbnRpY2FsIHRvIGdpdCdzIHNhbXBsZXMuCisjIFNlZSBpZiB0aGV5IGFyZSBzdGlsbCBp biBzeW5jLgorLlBIT05ZOiBjaGVjay1naXQtaG9vay1zY3JpcHQtc3luYworY2hlY2stZ2l0LWhv b2stc2NyaXB0LXN5bmM6CisJQGZhaWw9MDsJCQkJCQkJXAorCXQ9JCQobWt0ZW1wIC1kKQkJCQkJ CQlcCisJICAmJiBjZCAkJHQgJiYgZ2l0IGluaXQgLXEgJiYgY2QgLmdpdC9ob29rcwkJCVwKKwkg ICYmIGZvciBpIGluIHByZS1jb21taXQgcHJlLWFwcGx5cGF0Y2ggYXBwbHlwYXRjaC1tc2c7IGRv CVwKKwkgICAgICAgZGlmZiAtdSAkKGFic190b3Bfc3JjZGlyKS9zY3JpcHRzL2dpdC1ob29rcy8k JGkgJCRpLnNhbXBsZQlcCisJCSB8fCBmYWlsPTE7CQkJCQkJXAorCSAgICAgZG9uZTsJCQkJCQkJ XAorCXJtIC1yZiAkJHQ7CQkJCQkJCVwKKwl0ZXN0ICQkZmFpbCA9IDAKZGlmZiAtLWdpdCBhL2Jv b3RzdHJhcC5jb25mIGIvYm9vdHN0cmFwLmNvbmYKaW5kZXggODI4ZmZlZi4uYWMzYzI3OCAxMDA2 NDQKLS0tIGEvYm9vdHN0cmFwLmNvbmYKKysrIGIvYm9vdHN0cmFwLmNvbmYKQEAgLTEyOSw0ICsx MjksMjkgQEAgYm9vdHN0cmFwX3Bvc3RfaW1wb3J0X2hvb2soKQogYm9vdHN0cmFwX2VwaWxvZ3Vl KCkKIHsKICAgcGVybCAtcGkgLWUgInMvXEBQQUNLQUdFXEAvJHBhY2thZ2UvZyIgUkVBRE1FLXJl bGVhc2UKKworICAjIFNpbmNlIHRoaXMgaXMgYSAiR05VIiBwYWNrYWdlLCByZXBsYWNlIHRoaXMg bGluZQorICAjICAgaWYgTENfQUxMPUMgZ3JlcCAnR05VIEBQQUNLQUdFQCcgJCh0b3Bfc3JjZGly KS8qIDI+L2Rldi9udWxsIFwKKyAgIyAgICAgIHwgZ3JlcCAtdiAnbGlidG9vbDonID4vZGV2L251 bGw7IHRoZW4KKyAgIyB3aXRoIHRoaXM6CisgICMgICBpZiB0cnVlOyB0aGVuCisgICMgV2h5PyAg VGhhdCBwaXBlbGluZSBzZWFyY2hlcyBhbGwgZmlsZXMgaW4gJCh0b3Bfc3JjZGlyKSwgYW5kIGlm IHlvdQorICAjIGhhcHBlbiB0byBoYXZlIGxhcmdlIGZpbGVzIChvciBhcHBhcmVudGx5IGxhcmdl IHNwYXJzZSBmaWxlcyksIHRoZQorICAjIGZpcnN0IGdyZXAgbWF5IHdlbGwgcnVuIG91dCBvZiBt ZW1vcnkuCisgIHBlcmwgLXBpIC1lICdzL2lmIExDX0FMTD1DIGdyZXAgLkdOVSAuUEFDS0FHRS4q OyB0aGVuL2lmIHRydWU7IHRoZW4vJyBcCisgICAgcG8vTWFrZWZpbGUuaW4uaW4KKworICAjIElu c3RhbGwgb3VyIGdpdCBob29rcywgYXMgbG9uZyBhcyAiY3AiIGFjY2VwdHMgdGhlIC0tYmFja3Vw IG9wdGlvbiwKKyAgIyBzbyB0aGF0IHdlIGNhbiBiYWNrIHVwIGFueSBleGlzdGluZyBmaWxlcy4K KyAgY2FzZSAkKGNwIC0taGVscCkgaW4gKi0tYmFja3VwKikgYmFja3VwPTE7OyAqKSBiYWNrdXA9 MDs7IGVzYWMKKyAgaWYgdGVzdCAkYmFja3VwID0gMTsgdGhlbgorICAgIGhvb2tzPSQoY2Qgc2Ny aXB0cy9naXQtaG9va3MgJiYgZ2l0IGxzLWZpbGVzKQorICAgIGZvciBmIGluICRob29rczsgZG8K KyAgICAgICMgSWYgaXQgaXMgaWRlbnRpY2FsLCBza2lwIGl0LgorICAgICAgY21wIHNjcmlwdHMv Z2l0LWhvb2tzLyRmIC5naXQvaG9va3MvJGYgPiAvZGV2L251bGwgXAorICAgICAgICAmJiBjb250 aW51ZQorICAgICAgY3AgLS1iYWNrdXA9bnVtYmVyZWQgc2NyaXB0cy9naXQtaG9va3MvJGYgLmdp dC9ob29rcworICAgICAgY2htb2QgYS13IC5naXQvaG9va3MvJGYKKyAgICBkb25lCisgIGZpCiB9 CmRpZmYgLS1naXQgYS9zY3JpcHRzL2dpdC1ob29rcy9hcHBseXBhdGNoLW1zZyBiL3NjcmlwdHMv Z2l0LWhvb2tzL2FwcGx5cGF0Y2gtbXNnCm5ldyBmaWxlIG1vZGUgMTAwNzU1CmluZGV4IDAwMDAw MDAuLmE1ZDdiODQKLS0tIC9kZXYvbnVsbAorKysgYi9zY3JpcHRzL2dpdC1ob29rcy9hcHBseXBh dGNoLW1zZwpAQCAtMCwwICsxLDE1IEBACisjIS9iaW4vc2gKKyMKKyMgQW4gZXhhbXBsZSBob29r IHNjcmlwdCB0byBjaGVjayB0aGUgY29tbWl0IGxvZyBtZXNzYWdlIHRha2VuIGJ5CisjIGFwcGx5 cGF0Y2ggZnJvbSBhbiBlLW1haWwgbWVzc2FnZS4KKyMKKyMgVGhlIGhvb2sgc2hvdWxkIGV4aXQg d2l0aCBub24temVybyBzdGF0dXMgYWZ0ZXIgaXNzdWluZyBhbgorIyBhcHByb3ByaWF0ZSBtZXNz YWdlIGlmIGl0IHdhbnRzIHRvIHN0b3AgdGhlIGNvbW1pdC4gIFRoZSBob29rIGlzCisjIGFsbG93 ZWQgdG8gZWRpdCB0aGUgY29tbWl0IG1lc3NhZ2UgZmlsZS4KKyMKKyMgVG8gZW5hYmxlIHRoaXMg aG9vaywgcmVuYW1lIHRoaXMgZmlsZSB0byAiYXBwbHlwYXRjaC1tc2ciLgorCisuIGdpdC1zaC1z ZXR1cAorY29tbWl0bXNnPSIkKGdpdCByZXYtcGFyc2UgLS1naXQtcGF0aCBob29rcy9jb21taXQt bXNnKSIKK3Rlc3QgLXggIiRjb21taXRtc2ciICYmIGV4ZWMgIiRjb21taXRtc2ciICR7MSsiJEAi fQorOgpkaWZmIC0tZ2l0IGEvc2NyaXB0cy9naXQtaG9va3MvY29tbWl0LW1zZyBiL3NjcmlwdHMv Z2l0LWhvb2tzL2NvbW1pdC1tc2cKbmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMC4u ODg4YjgzYgotLS0gL2Rldi9udWxsCisrKyBiL3NjcmlwdHMvZ2l0LWhvb2tzL2NvbW1pdC1tc2cK QEAgLTAsMCArMSwxNTMgQEAKK2V2YWwgJyhleGl0ICQ/MCknICYmIGV2YWwgJ2V4ZWMgcGVybCAt dyAiJDAiICR7MSsiJEAifScKKyAgJiBldmFsICdleGVjIHBlcmwgLXcgIiQwIiAkYXJndjpxJwor ICAgIGlmIDA7CisKK3VzZSBzdHJpY3Q7Cit1c2Ugd2FybmluZ3M7CisobXkgJE1FID0gJDApID1+ IHN8LiovfHw7CisKKyMgRW11bGF0ZSBHaXQncyBjaG9pY2Ugb2YgdGhlIGVkaXRvciBmb3IgdGhl IGNvbW1pdCBtZXNzYWdlLgorY2hvbXAgKG15ICRlZGl0b3IgPSBgZ2l0IHZhciBHSVRfRURJVE9S YCk7CisjIEFuZCBoYXZlIGEgc2FuZSwgbWluaW1hbCBmYWxsYmFjayBpbiBjYXNlIG9mIHdlaXJk IGZhaWx1cmVzLgorJGVkaXRvciA9ICJ2aSIgaWYgJD8gIT0gMCBvciAkZWRpdG9yID1+IC9eXHMq XHovOworCisjIEtleXdvcmRzIGFsbG93ZWQgYmVmb3JlIHRoZSBjb2xvbiBvbiB0aGUgZmlyc3Qg bGluZSBvZiBhIGNvbW1pdCBtZXNzYWdlOgorIyBwcm9ncmFtIG5hbWVzIGFuZCBhIGZldyBnZW5l cmFsIGNhdGVnb3J5IG5hbWVzLgorbXkgQHZhbGlkID0gcXcoCisgICAgZGlmZiBkaWZmMyBjbXAg c2RpZmYKKworICAgIGdudWxpYiB0ZXN0cyBtYWludCBkb2MgYnVpbGQgc2NyaXB0cworICAgICk7 CitteSAkdl9vciA9IGpvaW4gJ3wnLCBAdmFsaWQ7CitteSAkdmFsaWRfcmVnZXggPSBxci9eKD86 JHZfb3IpJC87CisKKyMgUmV3cml0ZSB0aGUgJExPR19GSUxFIChvbGQgY29udGVudHMgaW4gQCRM SU5FX1JFRikgd2l0aCBhbiBhZGRpdGlvbmFsCisjIGEgY29tbWVudGVkIGRpYWdub3N0aWMgIiMg JEVSUiIgbGluZSBhdCB0aGUgdG9wLgorc3ViIHJld3JpdGUoJCQkKQoreworICBteSAoJGxvZ19m aWxlLCAkZXJyLCAkbGluZV9yZWYpID0gQF87CisgIGxvY2FsICpMT0c7CisgIG9wZW4gTE9HLCAn PicsICRsb2dfZmlsZQorICAgIG9yIGRpZSAiJE1FOiAkbG9nX2ZpbGU6IGZhaWxlZCB0byBvcGVu IGZvciB3cml0aW5nOiAkISI7CisgIHByaW50IExPRyAiIyAkZXJyIjsKKyAgcHJpbnQgTE9HIEAk bGluZV9yZWY7CisgIGNsb3NlIExPRworICAgIG9yIGRpZSAiJE1FOiAkbG9nX2ZpbGU6IGZhaWxl ZCB0byByZXdyaXRlOiAkIVxuIjsKK30KKworc3ViIHJlX2VkaXQoJCkKK3sKKyAgbXkgKCRsb2df ZmlsZSkgPSBAXzsKKworICB3YXJuICJJbnRlcnJ1cHQgKEN0cmwtQykgdG8gYWJvcnQuLi5cbiI7 CisKKyAgc3lzdGVtICdzaCcsICctYycsICIkZWRpdG9yICRsb2dfZmlsZSI7CisgICgkPyAmIDEy NykgfHwgKCQ/ID4+IDgpCisgICAgYW5kIGRpZSAiJE1FOiAkbG9nX2ZpbGU6IHRoZSBlZGl0b3Ig KCRlZGl0b3IpIGZhaWxlZCwgYWJvcnRpbmdcbiI7Cit9CisKK3N1YiBiYWRfZmlyc3RfbGluZSgk KQoreworICBteSAoJGxpbmUpID0gQF87CisKKyAgJGxpbmUgPX4gL15bVnZdZXJzaW9uIFxkLwor ICAgIGFuZCByZXR1cm4gJyc7CisKKyAgJGxpbmUgPX4gLzovCisgICAgb3IgcmV0dXJuICdtaXNz aW5nIGNvbG9uIG9uIGZpcnN0IGxpbmUgb2YgbG9nIG1lc3NhZ2UnOworCisgICRsaW5lID1+IC9c LiQvCisgICAgYW5kIHJldHVybiAnZG8gbm90IHVzZSBhIHBlcmlvZCAiLiIgYXQgdGhlIGVuZCBv ZiB0aGUgZmlyc3QgbGluZSc7CisKKyAgIyBUaGUgdG9rZW4ocykgYmVmb3JlIHRoZSBjb2xvbiBv biB0aGUgZmlyc3QgbGluZSBtdXN0IGJlIG9uIG91ciBsaXN0CisgICMgVG9rZW5zIG1heSBiZSBz cGFjZS0gb3IgY29tbWEtc2VwYXJhdGVkLgorICAobXkgJHByZV9jb2xvbiA9ICRsaW5lKSA9fiBz LzouKi8vOworICBteSBAd29yZCA9IHNwbGl0ICgvWyAsXS8sICRwcmVfY29sb24pOworICBteSBA YmFkID0gZ3JlcCAhLyR2YWxpZF9yZWdleC8sIEB3b3JkOworICBAYmFkCisgICAgYW5kIHJldHVy biAnaW52YWxpZCBmaXJzdCB3b3JkKHMpIG9mIHN1bW1hcnkgbGluZTogJyAuIGpvaW4gKCcsICcs IEBiYWQpOworCisgIHJldHVybiAnJzsKK30KKworIyBHaXZlbiBhICRMT0dfRklMRSBuYW1lIGFu ZCBhIFxATElORSBidWZmZXIsCisjIHJlYWQgdGhlIGNvbnRlbnRzIG9mIHRoZSBmaWxlIGludG8g dGhlIGJ1ZmZlciBhbmQgYW5hbHl6ZSBpdC4KKyMgSWYgdGhlIGxvZyBtZXNzYWdlIHBhc3NlcyBt dXN0ZXIsIHJldHVybiB0aGUgZW1wdHkgc3RyaW5nLgorIyBJZiBub3QsIHJldHVybiBhIGRpYWdu b3N0aWMuCitzdWIgY2hlY2tfbXNnKCQkKQoreworICBteSAoJGxvZ19maWxlLCAkbGluZV9yZWYp ID0gQF87CisKKyAgbG9jYWwgKkxPRzsKKyAgb3BlbiBMT0csICc8JywgJGxvZ19maWxlCisgICAg b3IgcmV0dXJuICJmYWlsZWQgdG8gb3BlbiBmb3IgcmVhZGluZzogJCEiOworICBAJGxpbmVfcmVm ID0gPExPRz47CisgIGNsb3NlIExPRzsKKworICBteSBAbGluZSA9IEAkbGluZV9yZWY7CisgIGNo b21wIEBsaW5lOworCisgICMgRG9uJ3QgZmlsdGVyIG91dCBibGFuayBvciBjb21tZW50IGxpbmVz OyBnaXQgZG9lcyB0aGF0IGFscmVhZHksCisgICMgYW5kIGlmIHdlIHdlcmUgdG8gaWdub3JlIHRo ZW0gaGVyZSwgaXQgY291bGQgbGVhZCB0byBjb21taXR0aW5nCisgICMgd2l0aCBsaW5lcyB0aGF0 IHN0YXJ0IHdpdGggIiMiIGluIHRoZSBsb2cuCisKKyAgIyBGaWx0ZXIgb3V0IGxlYWRpbmcgYmxh bmsgYW5kIGNvbW1lbnQgbGluZXMuCisgICMgd2hpbGUgKEBsaW5lICYmICRsaW5lWzBdID1+IC9e KD86Iy4qfFsgXHRdKikkLykgeyBzaGlmdCBAbGluZTsgfQorCisgICMgRmlsdGVyIG91dCBibGFu ayBhbmQgY29tbWVudCBsaW5lcyBhdCBFT0YuCisgICMgd2hpbGUgKEBsaW5lICYmICRsaW5lWyQj bGluZV0gPX4gL14oPzojLip8WyBcdF0qKSQvKSB7IHBvcCBAbGluZTsgfQorCisgIEBsaW5lID09 IDAKKyAgICBhbmQgcmV0dXJuICdubyBsb2cgbWVzc2FnZSc7CisKKyAgbXkgJGJhZCA9IGJhZF9m aXJzdF9saW5lICRsaW5lWzBdOworICAkYmFkCisgICAgYW5kIHJldHVybiAkYmFkOworCisgICMg U2Vjb25kIGxpbmUgc2hvdWxkIGJlIGJsYW5rIG9yIG5vdCBwcmVzZW50LgorICAyIDw9IEBsaW5l ICYmIGxlbmd0aCAkbGluZVsxXQorICAgIGFuZCByZXR1cm4gJ3NlY29uZCBsaW5lIG11c3QgYmUg ZW1wdHknOworCisgICMgTGltaXQgbGluZSBsZW5ndGggdG8gYWxsb3cgZm9yIHRoZSBDaGFuZ2VM b2cncyBsZWFkaW5nIFRBQi4KKyAgZm9yZWFjaCBteSAkbGluZSAoQGxpbmUpCisgICAgeworICAg ICAgNzIgPCBsZW5ndGggJGxpbmUgJiYgJGxpbmUgPX4gL15bXiNdLworICAgICAgICBhbmQgcmV0 dXJuICdsaW5lIGxvbmdlciB0aGFuIDcyJzsKKyAgICB9CisKKyAgbXkgJGJ1ZiA9IGpvaW4gKCJc biIsIEBsaW5lKSAuICJcbiI7CisgICRidWYgPX4gbSFodHRwcz86Ly9idWd6aWxsYVwucmVkaGF0 XC5jb20vc2hvd19idWdcLmNnaVw/aWQ9KFxkKykhcworICAgIGFuZCByZXR1cm4gInVzZSBzaG9y dGVyIGh0dHA6Ly9idWd6aWxsYS5yZWRoYXQuY29tLyQxIjsKKworICAkYnVmID1+IG0haHR0cHM/ Oi8vZGViYnVnc1wuZ251XC5vcmcvKD86Y2dpL2J1Z3JlcG9ydFwuY2dpXD9idWc9KT8oXGQrKSFz CisgICAgYW5kIHJldHVybiAidXNlIHNob3J0ZXIgaHR0cDovL2J1Z3MuZ251Lm9yZy8kMSI7CisK KyAgJGJ1ZiA9fiAvXiAqU2lnbmVkLW9mZi1ieTovbWkKKyAgICBhbmQgcmV0dXJuIHEoZG8gbm90 IHVzZSAiU2lnbmVkLW9mZi1ieToiKTsKKworICByZXR1cm4gJyc7Cit9CisKK3sKKyAgQEFSR1Yg PT0gMQorICAgIG9yIGRpZTsKKworICBteSAkbG9nX2ZpbGUgPSAkQVJHVlswXTsKKworICB3aGls ZSAoMSkKKyAgICB7CisgICAgICBteSBAbGluZTsKKyAgICAgIG15ICRlcnIgPSBjaGVja19tc2cg JGxvZ19maWxlLCBcQGxpbmU7CisgICAgICAkZXJyIGVxICcnCisgICAgICAgIGFuZCBsYXN0Owor ICAgICAgJGVyciA9ICIkTUU6ICRlcnJcbiI7CisgICAgICB3YXJuICRlcnI7CisgICAgICAjIElu c2VydCB0aGUgZGlhZ25vc3RpYyBhcyBhIGNvbW1lbnQgb24gdGhlIGZpcnN0IGxpbmUgb2YgJGxv Z19maWxlLgorICAgICAgcmV3cml0ZSAkbG9nX2ZpbGUsICRlcnIsIFxAbGluZTsKKyAgICAgIHJl X2VkaXQgJGxvZ19maWxlOworCisgICAgICAjIFN0b3AgaWYgb3VyIHBhcmVudCBpcyBraWxsZWQu CisgICAgICBnZXRwcGlkKCkgPT0gMQorICAgICAgICBhbmQgbGFzdDsKKyAgICB9Cit9CmRpZmYg LS1naXQgYS9zY3JpcHRzL2dpdC1ob29rcy9wcmUtYXBwbHlwYXRjaCBiL3NjcmlwdHMvZ2l0LWhv b2tzL3ByZS1hcHBseXBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNzU1CmluZGV4IDAwMDAwMDAuLjQx NDIwODIKLS0tIC9kZXYvbnVsbAorKysgYi9zY3JpcHRzL2dpdC1ob29rcy9wcmUtYXBwbHlwYXRj aApAQCAtMCwwICsxLDE0IEBACisjIS9iaW4vc2gKKyMKKyMgQW4gZXhhbXBsZSBob29rIHNjcmlw dCB0byB2ZXJpZnkgd2hhdCBpcyBhYm91dCB0byBiZSBjb21taXR0ZWQKKyMgYnkgYXBwbHlwYXRj aCBmcm9tIGFuIGUtbWFpbCBtZXNzYWdlLgorIworIyBUaGUgaG9vayBzaG91bGQgZXhpdCB3aXRo IG5vbi16ZXJvIHN0YXR1cyBhZnRlciBpc3N1aW5nIGFuCisjIGFwcHJvcHJpYXRlIG1lc3NhZ2Ug aWYgaXQgd2FudHMgdG8gc3RvcCB0aGUgY29tbWl0LgorIworIyBUbyBlbmFibGUgdGhpcyBob29r LCByZW5hbWUgdGhpcyBmaWxlIHRvICJwcmUtYXBwbHlwYXRjaCIuCisKKy4gZ2l0LXNoLXNldHVw CitwcmVjb21taXQ9IiQoZ2l0IHJldi1wYXJzZSAtLWdpdC1wYXRoIGhvb2tzL3ByZS1jb21taXQp IgordGVzdCAteCAiJHByZWNvbW1pdCIgJiYgZXhlYyAiJHByZWNvbW1pdCIgJHsxKyIkQCJ9Cis6 CmRpZmYgLS1naXQgYS9zY3JpcHRzL2dpdC1ob29rcy9wcmUtY29tbWl0IGIvc2NyaXB0cy9naXQt aG9va3MvcHJlLWNvbW1pdApuZXcgZmlsZSBtb2RlIDEwMDc1NQppbmRleCAwMDAwMDAwLi42OGQ2 MmQ1Ci0tLSAvZGV2L251bGwKKysrIGIvc2NyaXB0cy9naXQtaG9va3MvcHJlLWNvbW1pdApAQCAt MCwwICsxLDQ5IEBACisjIS9iaW4vc2gKKyMKKyMgQW4gZXhhbXBsZSBob29rIHNjcmlwdCB0byB2 ZXJpZnkgd2hhdCBpcyBhYm91dCB0byBiZSBjb21taXR0ZWQuCisjIENhbGxlZCBieSAiZ2l0IGNv bW1pdCIgd2l0aCBubyBhcmd1bWVudHMuICBUaGUgaG9vayBzaG91bGQKKyMgZXhpdCB3aXRoIG5v bi16ZXJvIHN0YXR1cyBhZnRlciBpc3N1aW5nIGFuIGFwcHJvcHJpYXRlIG1lc3NhZ2UgaWYKKyMg aXQgd2FudHMgdG8gc3RvcCB0aGUgY29tbWl0LgorIworIyBUbyBlbmFibGUgdGhpcyBob29rLCBy ZW5hbWUgdGhpcyBmaWxlIHRvICJwcmUtY29tbWl0Ii4KKworaWYgZ2l0IHJldi1wYXJzZSAtLXZl cmlmeSBIRUFEID4vZGV2L251bGwgMj4mMQordGhlbgorCWFnYWluc3Q9SEVBRAorZWxzZQorCSMg SW5pdGlhbCBjb21taXQ6IGRpZmYgYWdhaW5zdCBhbiBlbXB0eSB0cmVlIG9iamVjdAorCWFnYWlu c3Q9NGI4MjVkYzY0MmNiNmViOWEwNjBlNTRiZjhkNjkyODhmYmVlNDkwNAorZmkKKworIyBJZiB5 b3Ugd2FudCB0byBhbGxvdyBub24tQVNDSUkgZmlsZW5hbWVzIHNldCB0aGlzIHZhcmlhYmxlIHRv IHRydWUuCithbGxvd25vbmFzY2lpPSQoZ2l0IGNvbmZpZyAtLWJvb2wgaG9va3MuYWxsb3dub25h c2NpaSkKKworIyBSZWRpcmVjdCBvdXRwdXQgdG8gc3RkZXJyLgorZXhlYyAxPiYyCisKKyMgQ3Jv c3MgcGxhdGZvcm0gcHJvamVjdHMgdGVuZCB0byBhdm9pZCBub24tQVNDSUkgZmlsZW5hbWVzOyBw cmV2ZW50CisjIHRoZW0gZnJvbSBiZWluZyBhZGRlZCB0byB0aGUgcmVwb3NpdG9yeS4gV2UgZXhw bG9pdCB0aGUgZmFjdCB0aGF0IHRoZQorIyBwcmludGFibGUgcmFuZ2Ugc3RhcnRzIGF0IHRoZSBz cGFjZSBjaGFyYWN0ZXIgYW5kIGVuZHMgd2l0aCB0aWxkZS4KK2lmIFsgIiRhbGxvd25vbmFzY2lp IiAhPSAidHJ1ZSIgXSAmJgorCSMgTm90ZSB0aGF0IHRoZSB1c2Ugb2YgYnJhY2tldHMgYXJvdW5k IGEgdHIgcmFuZ2UgaXMgb2sgaGVyZSwgKGl0J3MKKwkjIGV2ZW4gcmVxdWlyZWQsIGZvciBwb3J0 YWJpbGl0eSB0byBTb2xhcmlzIDEwJ3MgL3Vzci9iaW4vdHIpLCBzaW5jZQorCSMgdGhlIHNxdWFy ZSBicmFja2V0IGJ5dGVzIGhhcHBlbiB0byBmYWxsIGluIHRoZSBkZXNpZ25hdGVkIHJhbmdlLgor CXRlc3QgJChnaXQgZGlmZiAtLWNhY2hlZCAtLW5hbWUtb25seSAtLWRpZmYtZmlsdGVyPUEgLXog JGFnYWluc3QgfAorCSAgTENfQUxMPUMgdHIgLWQgJ1sgLX5dXDAnIHwgd2MgLWMpICE9IDAKK3Ro ZW4KKwljYXQgPDxcRU9GCitFcnJvcjogQXR0ZW1wdCB0byBhZGQgYSBub24tQVNDSUkgZmlsZSBu YW1lLgorCitUaGlzIGNhbiBjYXVzZSBwcm9ibGVtcyBpZiB5b3Ugd2FudCB0byB3b3JrIHdpdGgg cGVvcGxlIG9uIG90aGVyIHBsYXRmb3Jtcy4KKworVG8gYmUgcG9ydGFibGUgaXQgaXMgYWR2aXNh YmxlIHRvIHJlbmFtZSB0aGUgZmlsZS4KKworSWYgeW91IGtub3cgd2hhdCB5b3UgYXJlIGRvaW5n IHlvdSBjYW4gZGlzYWJsZSB0aGlzIGNoZWNrIHVzaW5nOgorCisgIGdpdCBjb25maWcgaG9va3Mu YWxsb3dub25hc2NpaSB0cnVlCitFT0YKKwlleGl0IDEKK2ZpCisKKyMgSWYgdGhlcmUgYXJlIHdo aXRlc3BhY2UgZXJyb3JzLCBwcmludCB0aGUgb2ZmZW5kaW5nIGZpbGUgbmFtZXMgYW5kIGZhaWwu CitleGVjIGdpdCBkaWZmLWluZGV4IC0tY2hlY2sgLS1jYWNoZWQgJGFnYWluc3QgLS0KLS0gCjIu Ny40CgoKRnJvbSBlZGQ5NDJjYTI3ZDU3MGEzM2Q2MTJiMTJlZWNhYTMzYTc2NjQwZTQ2IE1vbiBT ZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gTWV5ZXJpbmcgPG1leWVyaW5nQGZiLmNvbT4K RGF0ZTogRnJpLCAxMiBBdWcgMjAxNiAyMTo0MDoyOSAtMDcwMApTdWJqZWN0OiBbUEFUQ0ggNC80 XSBkaWZmMzogZml4IGxlYWtzLCBmb3IgcmVhbAoKKiBzcmMvZGlmZjMuYyAoc3RydWN0IGRpZmZf YmxvY2spW2xpbnRdOiBBZGQgbWVtYmVyLCBuMi4KKGZyZWVfZGlmZl9ibG9jaywgbmV4dF90b19u Mik6IE5ldyBmdW5jdGlvbnMuCiogdGVzdHMvZGlmZjM6IEFkZCBtb3JlIHRlc3QgY292ZXJhZ2Uu Ci0tLQogc3JjL2RpZmYzLmMgfCA1NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0KIHRlc3RzL2RpZmYzIHwgNjYgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2Vk LCAxMTggaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvZGlm ZjMuYyBiL3NyYy9kaWZmMy5jCmluZGV4IDBlYjY0M2UuLmI4MGFlYjMgMTAwNjQ0Ci0tLSBhL3Ny Yy9kaWZmMy5jCisrKyBiL3NyYy9kaWZmMy5jCkBAIC03OCw2ICs3OCw5IEBAIHN0cnVjdCBkaWZm X2Jsb2NrIHsKICAgY2hhciAqKmxpbmVzWzJdOwkJLyogVGhlIGFjdHVhbCBsaW5lcyAobWF5IGNv bnRhaW4gbnVsbHMpICovCiAgIHNpemVfdCAqbGVuZ3Roc1syXTsJCS8qIExpbmUgbGVuZ3RocyAo aW5jbHVkaW5nIG5ld2xpbmVzLCBpZiBhbnkpICovCiAgIHN0cnVjdCBkaWZmX2Jsb2NrICpuZXh0 OworI2lmZGVmIGxpbnQKKyAgc3RydWN0IGRpZmZfYmxvY2sgKm4yOwkvKiBVc2VkIG9ubHkgd2hl biBmcmVlaW5nLiAgKi8KKyNlbmRpZgogfTsKCiAvKiBUaHJlZSB3YXkgZGlmZiAqLwpAQCAtMTc2 LDcgKzE3OSw3IEBAIHN0YXRpYyBzdHJ1Y3QgZGlmZjNfYmxvY2sgKmNyZWF0ZV9kaWZmM19ibG9j ayAobGluLCBsaW4sIGxpbiwgbGluLCBsaW4sIGxpbik7CiBzdGF0aWMgc3RydWN0IGRpZmYzX2Js b2NrICptYWtlXzN3YXlfZGlmZiAoc3RydWN0IGRpZmZfYmxvY2sgKiwgc3RydWN0IGRpZmZfYmxv Y2sgKik7CiBzdGF0aWMgc3RydWN0IGRpZmYzX2Jsb2NrICpyZXZlcnNlX2RpZmYzX2Jsb2NrbGlz dCAoc3RydWN0IGRpZmYzX2Jsb2NrICopOwogc3RhdGljIHN0cnVjdCBkaWZmM19ibG9jayAqdXNp bmdfdG9fZGlmZjNfYmxvY2sgKHN0cnVjdCBkaWZmX2Jsb2NrICpbMl0sIHN0cnVjdCBkaWZmX2Js b2NrICpbMl0sIGludCwgaW50LCBzdHJ1Y3QgZGlmZjNfYmxvY2sgY29uc3QgKik7Ci1zdGF0aWMg c3RydWN0IGRpZmZfYmxvY2sgKnByb2Nlc3NfZGlmZiAoY2hhciBjb25zdCAqLCBjaGFyIGNvbnN0 ICosIHN0cnVjdCBkaWZmX2Jsb2NrICoqKTsKK3N0YXRpYyBzdHJ1Y3QgZGlmZl9ibG9jayAqcHJv Y2Vzc19kaWZmIChjaGFyIGNvbnN0ICosIGNoYXIgY29uc3QgKiwgc3RydWN0IGRpZmZfYmxvY2sg KiosIGNoYXIgKiopOwogc3RhdGljIHZvaWQgY2hlY2tfc3Rkb3V0ICh2b2lkKTsKIHN0YXRpYyB2 b2lkIGZhdGFsIChjaGFyIGNvbnN0ICopIF9fYXR0cmlidXRlX18oKG5vcmV0dXJuKSk7CiBzdGF0 aWMgdm9pZCBvdXRwdXRfZGlmZjMgKEZJTEUgKiwgc3RydWN0IGRpZmYzX2Jsb2NrICosIGludCBj b25zdFszXSwgaW50IGNvbnN0WzNdKTsKQEAgLTIxMiw2ICsyMTUsMzggQEAgc3RhdGljIHN0cnVj dCBvcHRpb24gY29uc3QgbG9uZ29wdHNbXSA9CiAgIHswLCAwLCAwLCAwfQogfTsKCitzdGF0aWMg dm9pZAorZnJlZV9kaWZmX2Jsb2NrIChzdHJ1Y3QgZGlmZl9ibG9jayAqcCkKK3sKKyNpZm5kZWYg bGludAorICAodm9pZClwOworI2Vsc2UKKyAgd2hpbGUgKHApCisgICAgeworICAgICAgZnJlZSAo cC0+bGluZXNbMF0pOworICAgICAgZnJlZSAocC0+bGluZXNbMV0pOworICAgICAgZnJlZSAocC0+ bGVuZ3Roc1swXSk7CisgICAgICBmcmVlIChwLT5sZW5ndGhzWzFdKTsKKyAgICAgIHN0cnVjdCBk aWZmX2Jsb2NrICpuZXh0ID0gcC0+bjI7CisgICAgICBmcmVlIChwKTsKKyAgICAgIHAgPSBuZXh0 OworICAgIH0KKyNlbmRpZgorfQorCisvKiBDb3B5IGVhY2ggbmV4dCBwb2ludGVyIHRvIG4yLCBz aW5jZSBtYWtlXzN3YXlfZGlmZiB3b3VsZCBjbG9iYmVyIHRoZSBmb3JtZXIsCisgICB5ZXQgd2Ug d2lsbCBzdGlsbCBuZWVkIHNvbWV0aGluZyB0byBmcmVlIHRoZXNlIGJ1ZmZlcnMuICAqLworc3Rh dGljIHZvaWQKK25leHRfdG9fbjIgKHN0cnVjdCBkaWZmX2Jsb2NrICpwKQoreworI2lmbmRlZiBs aW50CisgICh2b2lkKXA7CisjZWxzZQorICB3aGlsZSAocCkKKyAgICBwID0gcC0+bjIgPSBwLT5u ZXh0OworI2VuZGlmCit9CisKIGludAogbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogewpA QCAtMzc3LDEwICs0MTIsMTkgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAvKiBJ bnZva2UgZGlmZiB0d2ljZSBvbiB0d28gcGFpcnMgb2YgaW5wdXQgZmlsZXMsIGNvbWJpbmUgdGhl IHR3bwogICAgICBkaWZmcywgYW5kIG91dHB1dCB0aGVtLiAgKi8KCisgIGNoYXIgKmIwLCAqYjE7 CiAgIGNvbW1vbm5hbWUgPSBmaWxlW3Jldl9tYXBwaW5nW0ZJTEVDXV07Ci0gIHRocmVhZDEgPSBw cm9jZXNzX2RpZmYgKGZpbGVbcmV2X21hcHBpbmdbRklMRTFdXSwgY29tbW9ubmFtZSwgJmxhc3Rf YmxvY2spOwotICB0aHJlYWQwID0gcHJvY2Vzc19kaWZmIChmaWxlW3Jldl9tYXBwaW5nW0ZJTEUw XV0sIGNvbW1vbm5hbWUsICZsYXN0X2Jsb2NrKTsKKyAgdGhyZWFkMSA9IHByb2Nlc3NfZGlmZiAo ZmlsZVtyZXZfbWFwcGluZ1tGSUxFMV1dLCBjb21tb25uYW1lLCAmbGFzdF9ibG9jaywgJmIxKTsK KyAgdGhyZWFkMCA9IHByb2Nlc3NfZGlmZiAoZmlsZVtyZXZfbWFwcGluZ1tGSUxFMF1dLCBjb21t b25uYW1lLCAmbGFzdF9ibG9jaywgJmIwKTsKKworICBuZXh0X3RvX24yICh0aHJlYWQwKTsKKyAg bmV4dF90b19uMiAodGhyZWFkMSk7CisKICAgZGlmZjMgPSBtYWtlXzN3YXlfZGlmZiAodGhyZWFk MCwgdGhyZWFkMSk7CisKKyAgZnJlZV9kaWZmX2Jsb2NrICh0aHJlYWQwKTsKKyAgZnJlZV9kaWZm X2Jsb2NrICh0aHJlYWQxKTsKKwogICBpZiAoZWRzY3JpcHQpCiAgICAgY29uZmxpY3RzX2ZvdW5k CiAgICAgICA9IG91dHB1dF9kaWZmM19lZHNjcmlwdCAoc3Rkb3V0LCBkaWZmMywgbWFwcGluZywg cmV2X21hcHBpbmcsCkBAIC00MDAsNiArNDQ0LDggQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiph cmd2KQogICAgICAgY29uZmxpY3RzX2ZvdW5kID0gZmFsc2U7CiAgICAgfQoKKyAgZnJlZSAoYjAp OworICBmcmVlIChiMSk7CiAgIGNoZWNrX3N0ZG91dCAoKTsKICAgZXhpdCAoY29uZmxpY3RzX2Zv dW5kKTsKIH0KQEAgLTkzOCw3ICs5ODQsOCBAQCBjb21wYXJlX2xpbmVfbGlzdCAoY2hhciAqIGNv bnN0IGxpc3QxW10sIHNpemVfdCBjb25zdCBsZW5ndGhzMVtdLAogc3RhdGljIHN0cnVjdCBkaWZm X2Jsb2NrICoKIHByb2Nlc3NfZGlmZiAoY2hhciBjb25zdCAqZmlsZWEsCiAJICAgICAgY2hhciBj b25zdCAqZmlsZWIsCi0JICAgICAgc3RydWN0IGRpZmZfYmxvY2sgKipsYXN0X2Jsb2NrKQorCSAg ICAgIHN0cnVjdCBkaWZmX2Jsb2NrICoqbGFzdF9ibG9jaywKKwkgICAgICBjaGFyICoqYnVmX3Rv X2ZyZWUpCiB7CiAgIGNoYXIgKmRpZmZfY29udGVudHM7CiAgIGNoYXIgKmRpZmZfbGltaXQ7CkBA IC05NTMsNiArMTAwMCw3IEBAIHByb2Nlc3NfZGlmZiAoY2hhciBjb25zdCAqZmlsZWEsCiAJCQkJ ICBzaXplb2YgKmJwdHItPmxlbmd0aHNbMV0pKTsKCiAgIGRpZmZfbGltaXQgPSByZWFkX2RpZmYg KGZpbGVhLCBmaWxlYiwgJmRpZmZfY29udGVudHMpOworICAqYnVmX3RvX2ZyZWUgPSBkaWZmX2Nv bnRlbnRzOwogICBzY2FuX2RpZmYgPSBkaWZmX2NvbnRlbnRzOwoKICAgd2hpbGUgKHNjYW5fZGlm ZiA8IGRpZmZfbGltaXQpCmRpZmYgLS1naXQgYS90ZXN0cy9kaWZmMyBiL3Rlc3RzL2RpZmYzCmlu ZGV4IGExZmMyODcuLmE0MDYzMWIgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2RpZmYzCisrKyBiL3Rlc3Rz L2RpZmYzCkBAIC0yNyw0ICsyNyw3MCBAQCBkaWZmMyBhIGEgYSA+IG91dCAyPiBlcnIgfHwgZmFp bD0xCiBjb21wYXJlIC9kZXYvbnVsbCBvdXQgfHwgZmFpbD0xCiBjb21wYXJlIC9kZXYvbnVsbCBl cnIgfHwgZmFpbD0xCgorIyBUaGlzIHdvdWxkIGhhdmUgcHJvdm9rZWQgYSBub250cml2aWFsIGxl YWsgcHJpb3IgdG8gZGlmZnV0aWxzLTMuNSwKKyMgZHVlIHRvIHRoZSBub250cml2aWFsIGxpc3Qg b2YgZGlmZl9ibG9jayBzdHJ1Y3RzLgorc2VxIDEwIDQwfHNlZCAncy8xJC94LycgPiBkIHx8IGZy YW1ld29ya19mYWlsdXJlXworc2VxIDEwIDQwfHNlZCAncy81JC95LycgPiBlIHx8IGZyYW1ld29y a19mYWlsdXJlXworc2VxIDEwIDQwfHNlZCAncy84JC96LycgPiBmIHx8IGZyYW1ld29ya19mYWls dXJlXworY2F0IDw8J0VPRicgPiBleHA0MCB8fCBmcmFtZXdvcmtfZmFpbHVyZV8KKz09PT0xCisx OjJjCisgIDF4CisyOjJjCiszOjJjCisgIDExCis9PT09MgorMTo2YworMzo2YworICAxNQorMjo2 YworICAxeQorPT09PTMKKzE6OWMKKzI6OWMKKyAgMTgKKzM6OWMKKyAgMXoKKz09PT0xCisxOjEy YworICAyeAorMjoxMmMKKzM6MTJjCisgIDIxCis9PT09MgorMToxNmMKKzM6MTZjCisgIDI1Cisy OjE2YworICAyeQorPT09PTMKKzE6MTljCisyOjE5YworICAyOAorMzoxOWMKKyAgMnoKKz09PT0x CisxOjIyYworICAzeAorMjoyMmMKKzM6MjJjCisgIDMxCis9PT09MgorMToyNmMKKzM6MjZjCisg IDM1CisyOjI2YworICAzeQorPT09PTMKKzE6MjljCisyOjI5YworICAzOAorMzoyOWMKKyAgM3oK K0VPRgorCitkaWZmMyBkIGUgZiA+IG91dCAyPiBlcnIKK2NvbXBhcmUgZXhwNDAgb3V0IHx8IGZh aWw9MQorY29tcGFyZSAvZGV2L251bGwgZXJyIHx8IGZhaWw9MQorCiBFeGl0ICRmYWlsCi0tIAoy LjcuNAoK --001a1141549ee7ec28053a0132dd-- From unknown Fri Aug 15 20:26:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#24210: [bug-diffutils] bug#24210: bug#24210: bug#24210: diff3 in diffutils 3.4 is broken Resent-From: Jim Meyering Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Mon, 15 Aug 2016 00:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24210 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: Bastian Beischer Cc: 24210@debbugs.gnu.org Received: via spool by 24210-submit@debbugs.gnu.org id=B24210.14712200451711 (code B ref 24210); Mon, 15 Aug 2016 00:15:02 +0000 Received: (at 24210) by debbugs.gnu.org; 15 Aug 2016 00:14:05 +0000 Received: from localhost ([127.0.0.1]:57671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bZ5XY-0000RX-TV for submit@debbugs.gnu.org; Sun, 14 Aug 2016 20:14:05 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:32823) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bZ5XW-0000Qt-6V for 24210@debbugs.gnu.org; Sun, 14 Aug 2016 20:14:02 -0400 Received: by mail-oi0-f66.google.com with SMTP id s207so3324331oie.0 for <24210@debbugs.gnu.org>; Sun, 14 Aug 2016 17:14:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=xmF/r6w5c2uOKkPbfO6hKt7PSRm0Fn9qm4796sA99u4=; b=rIbfEC6fL/rR9opUeeJDEfMlIdLJyx+ujsp5GctIm4qJcuH+aVgs4kfZQJ6l1LL3/Y 8XopqI7Yh58A7SCESerikPwZSXLR7OG7e8+fU3z1cJlF+wp/Pa8gYp4vFB24jAxK8lZV wvNPfY7NwRMruQgHd8zpPBlUsslxqPX7PQdfbDJ1wvMwe1pfMEbI5KBh7zvkMvH6YCgB FvGsd0Hrg4WWjOOwt/C3ZZZxICzCb9jndc+UEA27l/KqodGH+TGqGMLBDfWHMx9dyve6 TsXW/pnymZqctzpEq0fCJbQBkWC0wV1xFdG5ouwsEOEPnrtOlAuX0eO3ai49mTtqGMFY PCVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=xmF/r6w5c2uOKkPbfO6hKt7PSRm0Fn9qm4796sA99u4=; b=mLJR5m538Rcul+bTozwMPq9EWlz7TuPcUQCoCOnajKvLAOd7VY6CzcmQ8jxl+hz6MU 1OwjbUFiZ4KeCv1DM4kBnFAOyi4QaPV6lzT9ejNdZlErQ/ZXVSS8wHdJhdIPEeAtriyJ tBdXUaYBc0H4nZtQnbZ7wiFUYSsl1h3CY5d+DleYTseHA9zIRcZMY+ob5qAgrOieOZIc YZF0nxj73ktoup3SgqDZukpuoHH1KsVAZgqCrPAvFBHUsxoSKs6rOkU41MHVt6inQ3SB +4xoLyPfEiF3ENsoiJ75OvvuTgD2R/KGYWsGZAXwmdUFVFG8hTktcL08f0LQFAUlIRPV zBlg== X-Gm-Message-State: AEkoouso8+fAJDaueZ6/suH+/3MnM3f8vvPliPnSE+9qhpr1PEv8Za8al26jyShIn2GPP1v0iGx1Jt+ei4aJAQ== X-Received: by 10.202.81.214 with SMTP id f205mr12449689oib.161.1471220036722; Sun, 14 Aug 2016 17:13:56 -0700 (PDT) MIME-Version: 1.0 Received: by 10.202.236.16 with HTTP; Sun, 14 Aug 2016 17:13:35 -0700 (PDT) In-Reply-To: References: From: Jim Meyering Date: Sun, 14 Aug 2016 17:13:35 -0700 X-Google-Sender-Auth: QeyuE7IdrVpPnXnC6C3ob3DurjM Message-ID: Content-Type: text/plain; charset=UTF-8 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On Sat, Aug 13, 2016 at 10:14 PM, Jim Meyering wrote: > On Fri, Aug 12, 2016 at 9:35 AM, Jim Meyering wrote: >> On Fri, Aug 12, 2016 at 7:22 AM, Bastian Beischer >> wrote: >>> Hello, >>> >>> Please try to run diff3 from diffutils 3.4 as follows: >>> >>> echo a > a.txt >>> echo b > b.txt >>> echo c > c.txt >>> diff3 a.txt b.txt c.txt > ... >>> There was only one commit in src/diff3.c between 3.3 and 3.4: >>> >>> http://git.savannah.gnu.org/cgit/diffutils.git/commit/src?id=3b74a905c5460e7979c53273ac90345860d001a7 >>> >>> Reverting this commit fixes the issue. >> >> Yikes. >> Thank you for the report. >> I confirm that that patch is erroneous, and will prepare a complete >> fix (adding your test and a NEWS entry) shortly. >> Looks like diffutils-3.5 will have to be released pretty soon. > > I've reverted that, added your test case and updated NEWS with a > commit in your name. Please review that first commit, in the attached. ... Normally I would be more patient in waiting for your review, but I'm in a hurry to make diffutils-3.5, so have just pushed those, and am now preparing a pre-release snapshot. From unknown Fri Aug 15 20:26:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#24210: [bug-diffutils] bug#24210: bug#24210: bug#24210: diff3 in diffutils 3.4 is broken Resent-From: Bastian Beischer Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Mon, 15 Aug 2016 05:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24210 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: Jim Meyering Cc: 24210@debbugs.gnu.org Received: via spool by 24210-submit@debbugs.gnu.org id=B24210.1471240465703 (code B ref 24210); Mon, 15 Aug 2016 05:55:02 +0000 Received: (at 24210) by debbugs.gnu.org; 15 Aug 2016 05:54:25 +0000 Received: from localhost ([127.0.0.1]:57813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bZAqv-0000BH-Bi for submit@debbugs.gnu.org; Mon, 15 Aug 2016 01:54:25 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:37911) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bZAqt-0000B3-9C for 24210@debbugs.gnu.org; Mon, 15 Aug 2016 01:54:23 -0400 Received: by mail-wm0-f54.google.com with SMTP id o80so83452535wme.1 for <24210@debbugs.gnu.org>; Sun, 14 Aug 2016 22:54:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=tE2tLSPJe3FI2c57e0V1UySbfCi9qDPYLwehLpi+4Yc=; b=BbRVh7GA//Wq1doKrAF4O92Sh3XDmu1Ublj61N57DITR0mW8aJYWFMbg+3/RzTc/Q1 3JF4e0bd/VwTEF+7CFSX9aSBFhXhzIZkFx7VBSHQeS6dN4PVCcQDp6SJCsAtKNJJVlWE GEV6oaxCpuTqLO/FGTnjlORJOFCWM45I3sfKu/A4leoQr8B8CrToNiDL76Zy4J32KAau G9tQMSfRB6bBOiwS/nT3sXEUZwTPj0koYowz2Qqq3g7m5nTYfbkcz6L44sDXfC64lGOV VB19/jAjzS1PUgVHan7fMj0Ilkr4KwXBQ4QPhwp1PPbSYM48Pn0x76/c7mOcJAlf4EjV PyHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=tE2tLSPJe3FI2c57e0V1UySbfCi9qDPYLwehLpi+4Yc=; b=iLv57UpH74yxpm217oSIGqLxf4I+u2YYjUvQUKTsdZZnm59xXbvZtwAXAEpAehhny6 cAz9iSGcH+0ME80lJZWmodDuRd6bizxE+UrxNwOd/1Wus3UAhJ4be6UdyPZUwEyfcIBe tLWjNOcyXV6URX3Wcf6RT4CG+3Un0T6XWLvuN3mTBqk9Fv8ET1gBl25n5G/I0Y3Ywkgo Wnn+LKdHPH/lWUnfsIDGiRRDAznfWbiBLZWtlnGCq5D0B/f+2ltd9DlP+gpYOgHiTVJ8 ckpuKqS+X2vE7+LirZfZxqyEV7lmub4rknAU7rfS/9EtlfiuLmJC6X6QNvppE74xaz0Z cYtA== X-Gm-Message-State: AEkooutnq0FszUtOL5skS9v/Pvuvq5VE0rh0IAr0RsHvp36vmGPgVWKiCF2MsDiLmXM9F243iz9BIk4W3GijJQ== X-Received: by 10.194.133.200 with SMTP id pe8mr28428337wjb.14.1471240457308; Sun, 14 Aug 2016 22:54:17 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.152.87 with HTTP; Sun, 14 Aug 2016 22:54:16 -0700 (PDT) Received: by 10.28.152.87 with HTTP; Sun, 14 Aug 2016 22:54:16 -0700 (PDT) In-Reply-To: References: From: Bastian Beischer Date: Mon, 15 Aug 2016 07:54:16 +0200 X-Google-Sender-Auth: sVxLDFzmUz46W0ZKvWvF42f2n2I Message-ID: Content-Type: multipart/alternative; boundary=089e0117671fd64fb3053a15dc76 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --089e0117671fd64fb3053a15dc76 Content-Type: text/plain; charset=UTF-8 Hey Jim, The patches look fine to me, although I don't know the source of diff3 well enough to be a good reviewer. I've tested the patches a bit and everything seems to be OK. Thanks for fixing this issue. Cheers Bastian Am 15.08.2016 02:14 schrieb "Jim Meyering" : > On Sat, Aug 13, 2016 at 10:14 PM, Jim Meyering wrote: > > On Fri, Aug 12, 2016 at 9:35 AM, Jim Meyering wrote: > >> On Fri, Aug 12, 2016 at 7:22 AM, Bastian Beischer > >> wrote: > >>> Hello, > >>> > >>> Please try to run diff3 from diffutils 3.4 as follows: > >>> > >>> echo a > a.txt > >>> echo b > b.txt > >>> echo c > c.txt > >>> diff3 a.txt b.txt c.txt > > ... > >>> There was only one commit in src/diff3.c between 3.3 and 3.4: > >>> > >>> http://git.savannah.gnu.org/cgit/diffutils.git/commit/src?id= > 3b74a905c5460e7979c53273ac90345860d001a7 > >>> > >>> Reverting this commit fixes the issue. > >> > >> Yikes. > >> Thank you for the report. > >> I confirm that that patch is erroneous, and will prepare a complete > >> fix (adding your test and a NEWS entry) shortly. > >> Looks like diffutils-3.5 will have to be released pretty soon. > > > > I've reverted that, added your test case and updated NEWS with a > > commit in your name. Please review that first commit, in the attached. > ... > Normally I would be more patient in waiting for your review, but I'm > in a hurry to make diffutils-3.5, so have just pushed those, and am > now preparing a pre-release snapshot. > --089e0117671fd64fb3053a15dc76 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

Hey Jim,

The patches look fine to me, although I don't know the s= ource of diff3 well enough to be a good reviewer. I've tested the patch= es a bit and everything seems to be OK. Thanks for fixing this issue.

Cheers
Bastian


Am 15.08.2016 02:= 14 schrieb "Jim Meyering" <jim@meyering.net>:
On Sat, Aug 13, 2016 at 10:14 PM, Jim Meyering <jim@meyering.net> wrote:
> On Fri, Aug 12, 2016 at 9:35 AM, Jim Meyering <jim@meyering.net> wrote:
>> On Fri, Aug 12, 2016 at 7:22 AM, Bastian Beischer
>> <bastian.bei= scher@rwth-aachen.de> wrote:
>>> Hello,
>>>
>>> Please try to run diff3 from diffutils 3.4 as follows:
>>>
>>> echo a > a.txt
>>> echo b > b.txt
>>> echo c > c.txt
>>> diff3 a.txt b.txt c.txt
> ...
>>> There was only one commit in src/diff3.c between 3.3 and 3.4:<= br> >>>
>>> http://git.savannah.gnu.org/cgit/diffutils.git/commit/= src?id=3D3b74a905c5460e7979c53273ac90345860d001a7
>>>
>>> Reverting this commit fixes the issue.
>>
>> Yikes.
>> Thank you for the report.
>> I confirm that that patch is erroneous, and will prepare a complet= e
>> fix (adding your test and a NEWS entry) shortly.
>> Looks like diffutils-3.5 will have to be released pretty soon.
>
> I've reverted that, added your test case and updated NEWS with a > commit in your name. Please review that first commit, in the attached.=
...
Normally I would be more patient in waiting for your review, but I'm in a hurry to make diffutils-3.5, so have just pushed those, and am
now preparing a pre-release snapshot.
--089e0117671fd64fb3053a15dc76-- From unknown Fri Aug 15 20:26:43 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Bastian Beischer Subject: bug#24210: closed (Re: [bug-diffutils] bug#24210: bug#24210: bug#24210: diff3 in diffutils 3.4 is broken) Message-ID: References: X-Gnu-PR-Message: they-closed 24210 X-Gnu-PR-Package: diffutils Reply-To: 24210@debbugs.gnu.org Date: Mon, 15 Aug 2016 13:57:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1471269422-18935-1" This is a multi-part message in MIME format... ------------=_1471269422-18935-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #24210: diff3 in diffutils 3.4 is broken which was filed against the diffutils package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 24210@debbugs.gnu.org. --=20 24210: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D24210 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1471269422-18935-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 24210-done) by debbugs.gnu.org; 15 Aug 2016 13:56:30 +0000 Received: from localhost ([127.0.0.1]:58404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bZINS-0004uc-Ia for submit@debbugs.gnu.org; Mon, 15 Aug 2016 09:56:30 -0400 Received: from mail-oi0-f67.google.com ([209.85.218.67]:33325) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bZINQ-0004uP-SV for 24210-done@debbugs.gnu.org; Mon, 15 Aug 2016 09:56:29 -0400 Received: by mail-oi0-f67.google.com with SMTP id s207so4462951oie.0 for <24210-done@debbugs.gnu.org>; Mon, 15 Aug 2016 06:56:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=SVkQ0L0enLvJpMwBEIdbjH1IGi26T+EpXHHQIYsbvzM=; b=0cQNnzNNyHelQXmXaufRg48aIH0DETzKUdgVXqIu+8uu2MzoLFj7HwEwhKeb9ZjM5r p8Bc5MmHAqkyXj9y2OjzzELoZ3JKEijzBvHZSWAdnGNZqXwC1dSX0hoOCZJD+TIBsqsQ tvlkUK8hJYRa/NVBOfZ5XJYsLxJgGMUzDFaKl5oC/0rWngEUQb+A57zgUn5ZTKjrggdr ScZRGK6qXG0ga/6E4PmuSXVXWYr2d8OT4LBRRqDm/8ryPhLghPfZ5yTrVmH6NDkMJVFR KmK1Ow33viBq1HucJvxJfp4D46zgiQ4LP+GmTjzcVG9k8KmfuKQKaD9/KR2O4E0TU9nD ubgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=SVkQ0L0enLvJpMwBEIdbjH1IGi26T+EpXHHQIYsbvzM=; b=YOhjRiqyKORDhW2josHKBAl3t/L867wlEFzQfEH0rte/pB4SQOD3essxy1Vx2YBlcH s+NbMI/o7iNvLBBCBR2QTToEmaJNa6UyhtOTH0oPTtzZS4CDy28TlZYfLNhZpd8NtRrv GAaQtufrNCc0NXI1sBRU1XlgKhGP9pb2YSF/uPMVxOR4e0a9fUbw6fN5i+HnD/wFgqhM yprrw+BGB8q8zovCAU7fGu4ikQpTVfTb6mVEMpXthM5bxag3A2jUrY9zDBmK3m5EUf9t v0KQdZBw+K65LqNFagV7DN4jyLhHhbdl9Jh1UcYFeO108VoyYhdcaRHpR1nMMP/WxPXX JHDg== X-Gm-Message-State: AEkoouvN/XbEnQ2SR+tpHp3JQkljwGu4ORoAF+yxzcMKa7k8kbEiPki1JdEamIGuEQQi92aD/7ADZdmhlxZbBQ== X-Received: by 10.202.182.85 with SMTP id g82mr29286oif.58.1471269383002; Mon, 15 Aug 2016 06:56:23 -0700 (PDT) MIME-Version: 1.0 Received: by 10.202.236.16 with HTTP; Mon, 15 Aug 2016 06:56:02 -0700 (PDT) In-Reply-To: References: From: Jim Meyering Date: Mon, 15 Aug 2016 06:56:02 -0700 X-Google-Sender-Auth: zNCdCPnm2JG8WZd8WK3qET3QIYE Message-ID: Subject: Re: [bug-diffutils] bug#24210: bug#24210: bug#24210: diff3 in diffutils 3.4 is broken To: Bastian Beischer Content-Type: text/plain; charset=UTF-8 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 24210-done Cc: 24210-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On Sun, Aug 14, 2016 at 10:54 PM, Bastian Beischer wrote: > The patches look fine to me, although I don't know the source of diff3 well > enough to be a good reviewer. I've tested the patches a bit and everything > seems to be OK. Thanks for fixing this issue. Thanks for testing. ------------=_1471269422-18935-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 12 Aug 2016 14:22:27 +0000 Received: from localhost ([127.0.0.1]:55268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bYDLv-000202-JT for submit@debbugs.gnu.org; Fri, 12 Aug 2016 10:22:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bYDLt-0001zp-OO for submit@debbugs.gnu.org; Fri, 12 Aug 2016 10:22:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bYDLl-0002xm-45 for submit@debbugs.gnu.org; Fri, 12 Aug 2016 10:22:19 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:57514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bYDLk-0002xR-UK for submit@debbugs.gnu.org; Fri, 12 Aug 2016 10:22:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bYDLe-0005XO-2o for bug-diffutils@gnu.org; Fri, 12 Aug 2016 10:22:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bYDLX-0002mG-9S for bug-diffutils@gnu.org; Fri, 12 Aug 2016 10:22:08 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:34035) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bYDLX-0002kp-1f for bug-diffutils@gnu.org; Fri, 12 Aug 2016 10:22:03 -0400 Received: by mail-wm0-x242.google.com with SMTP id q128so3137746wma.1 for ; Fri, 12 Aug 2016 07:22:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:from:date:message-id:subject:to; bh=aedQ9YhG+oKGWYpUlx+9l/Ig+3sICg/9nMU7xU4arOs=; b=t3/G7sX+EQu4SRwhu7BzkyTFY+CIaf8N9M5Zn64BsGtWKzyBKvs2jxnROvIgW4nATm Naj4CypFSxZY3kmKwXjRch10jV1h2sBM4a40GM7lCNd6cYcZoWTgRtrR7ybfLEJlfMf+ AUWqiGtI0zSh1mDMnUlaFm763Tg0rosXMiJ0SxUtRoBa4YZBWR7/EJmB0qiTXx4YPpAs vPqrbkfa/GDKu7UacOZhHjiZKmeRrkY3bODvHfI1o9xq6x90bKuygH3R15+7zSsFGLYe yoJMpxAt6DTGMgOvXNzFbU3fozeLGSEcOk7mI+6pN0FBqJUNRvofNEVVP8tnXTbVj57B 6GzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=aedQ9YhG+oKGWYpUlx+9l/Ig+3sICg/9nMU7xU4arOs=; b=LdKpJSvpglQFVsrs0gank7yDxPKuoF8qdE7YdC7bIAVNX9cth2RMD8QEO/hbfG8Xa+ qFHURB0qsA2ZvKSjrN7M/3ZEhi8WDdNcnPdTOE0CNCZTgB3C3fTIy4mpBtohbb3dL8Qq 6/Tnq+32Tf4vFaNNd0L/BlsNgai+XG6o35pgniv65/o2LegtZjH3h4kZ9BP96GCzVlgc behNql83d0C476JWxorELDjRw03xq5fCLQCZH+f0D75nWbFX3d7jC32HmGnSt9AEvuWq 4se/nqDUd8KRv+FB+1HrpPALO1+AzEqiXljZsKa/FgSumZydIEmRYh+lu2eYVs4YSS8U zgoA== X-Gm-Message-State: AEkoouvkCUoCZEh2cXN6Fhn+KHuRkGVVY3PCL2xWYC5AEL9RhCBqK8eqG39upuEN6lLWATsdGwwqeEjW6NMFCA== X-Received: by 10.28.27.143 with SMTP id b137mr3733726wmb.12.1471011720800; Fri, 12 Aug 2016 07:22:00 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.152.87 with HTTP; Fri, 12 Aug 2016 07:22:00 -0700 (PDT) From: Bastian Beischer Date: Fri, 12 Aug 2016 16:22:00 +0200 X-Google-Sender-Auth: SS5cc2U6zSflg9jXavyyoMTzmpE Message-ID: Subject: diff3 in diffutils 3.4 is broken To: bug-diffutils@gnu.org Content-Type: text/plain; charset=UTF-8 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) Hello, Please try to run diff3 from diffutils 3.4 as follows: echo a > a.txt echo b > b.txt echo c > c.txt diff3 a.txt b.txt c.txt Expected output (with diff3 from diffutils 3.3): ==== 1:1c a 2:1c b 3:1c c Actual output (with diff3 from diffutils 3.4): ====3 1:1c 2:1c a 3:1c c There was only one commit in src/diff3.c between 3.3 and 3.4: http://git.savannah.gnu.org/cgit/diffutils.git/commit/src?id=3b74a905c5460e7979c53273ac90345860d001a7 Reverting this commit fixes the issue. Best Bastian -- Bastian Beischer RWTH Aachen University of Technology @RWTH Aachen Office: 28 C 203 Phone: +49-241-80-27205 E-mail: beischer@physik.rwth-aachen.de Address: I. Physikalisches Institut B, Sommerfeldstr. 14, D-52074 Aachen @CERN Office: Bdg 32-4-B12 Phone: +41-22-76-75750 E-mail: bastian.beischer@cern.ch Address: CERN, CH-1211 Geneve 23 ------------=_1471269422-18935-1--