From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eric Hanchrow Newsgroups: gmane.emacs.bugs Subject: bug#21895: [PATCH] shr: don't invoke unbound function (Bug#21895) Date: Fri, 13 Nov 2015 01:35:47 +0000 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a1140cd06c0eb2d0524621438 X-Trace: ger.gmane.org 1447378581 10735 80.91.229.3 (13 Nov 2015 01:36:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 13 Nov 2015 01:36:21 +0000 (UTC) To: 21895@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Nov 13 02:36:11 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Zx3He-0001xZ-EH for geb-bug-gnu-emacs@m.gmane.org; Fri, 13 Nov 2015 02:36:10 +0100 Original-Received: from localhost ([::1]:50555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zx3Hd-0007Uh-TD for geb-bug-gnu-emacs@m.gmane.org; Thu, 12 Nov 2015 20:36:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zx3HZ-0007Tw-Nj for bug-gnu-emacs@gnu.org; Thu, 12 Nov 2015 20:36:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zx3HW-0001O5-A0 for bug-gnu-emacs@gnu.org; Thu, 12 Nov 2015 20:36:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:44563) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zx3HW-0001Nt-44 for bug-gnu-emacs@gnu.org; Thu, 12 Nov 2015 20:36:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Zx3HV-0006v3-Qq for bug-gnu-emacs@gnu.org; Thu, 12 Nov 2015 20:36:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eric Hanchrow Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 13 Nov 2015 01:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 21895 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 21895-submit@debbugs.gnu.org id=B21895.144737856026588 (code B ref 21895); Fri, 13 Nov 2015 01:36:01 +0000 Original-Received: (at 21895) by debbugs.gnu.org; 13 Nov 2015 01:36:00 +0000 Original-Received: from localhost ([127.0.0.1]:35271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zx3HT-0006ul-S4 for submit@debbugs.gnu.org; Thu, 12 Nov 2015 20:36:00 -0500 Original-Received: from mail-io0-f176.google.com ([209.85.223.176]:34914) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zx3HR-0006ud-SW for 21895@debbugs.gnu.org; Thu, 12 Nov 2015 20:35:58 -0500 Original-Received: by ioc74 with SMTP id 74so83941917ioc.2 for <21895@debbugs.gnu.org>; Thu, 12 Nov 2015 17:35:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :content-type; bh=HYb1TGY926QFlH47Dsn91Op7gflFVUKRx+66GjKxub0=; b=IkfC9xN8nnIgp58Xg5/kRc+5KYz2NNCSwIfmZk7W/c6qxN4yNxaQ0dX9iXtsMscN9m ty2zWlJ0HBWwX8swpQEyLymP3aAamcDWfeBwYsi6CEXLN1pCzPVwOwDT2CYHQiFke0Sn nPA+nQ3yu3FpLENxc+NQsPdWBR5yNnEG4JRs3pEhO9mI4Rp3OoTwlf9LKQM1ukl6rrXT DtXdiCl3qmxlcbYu03JjB0BcvaQufeN9I8nQUq3j9sPpbYekwp2yzCOrm0hLyVa9YZt6 uVz1f88qUSWuRUlj5IG5EFQ3wegx6PfLJMK4i2QLjkDA0SjACfPGdBVnQF6+09KvOj0D VrEQ== X-Received: by 10.107.32.209 with SMTP id g200mr10433012iog.39.1447378557126; Thu, 12 Nov 2015 17:35:57 -0800 (PST) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:108700 Archived-At: --001a1140cd06c0eb2d0524621438 Content-Type: multipart/alternative; boundary=001a1140cd06c0eb260524621436 --001a1140cd06c0eb260524621436 Content-Type: text/plain; charset=UTF-8 Again, but as an attachment. On Thu, Nov 12, 2015 at 5:29 PM Eric Hanchrow wrote: > * lisp/net/shr.el (fringes-p): > New function. > (shr-insert-document, shr-fill-text): Use it. > --- > lisp/net/shr.el | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/lisp/net/shr.el b/lisp/net/shr.el > index 58deaea..853b2fd 100644 > --- a/lisp/net/shr.el > +++ b/lisp/net/shr.el > @@ -203,6 +203,12 @@ cid: URL as the argument.") > (goto-char begin) > (shr-insert-document dom)))) > > +(defun fringes-p () > + "Return t if fringe-columns is bound, and either (fringe-columns 'left) > or (fringe-columns 'right) returns nonzero." > + (and (fboundp 'fringe-columns) > + (or (not (zerop (fringe-columns 'right))) > + (not (zerop (fringe-columns 'left)))))) > + > ;;;###autoload > (defun shr-insert-document (dom) > "Render the parsed document DOM into the current buffer. > @@ -230,19 +236,13 @@ DOM should be a parse tree as generated by > (if (not shr-use-fonts) > (- (window-body-width) 1 > (if (and (null shr-width) > - (or (zerop > - (fringe-columns > 'right)) > - (zerop > - (fringe-columns > 'left)))) > + (not (fringes-p))) > 0 > 1)) > (- (window-body-width nil t) > (* 2 (frame-char-width)) > (if (and (null shr-width) > - (or (zerop > - (fringe-columns > 'right)) > - (zerop > - (fringe-columns > 'left)))) > + (not (fringes-p))) > (* (frame-char-width) 2) > 0)))))) > (shr-descend dom) > @@ -466,8 +466,7 @@ size, and full-buffer size." > ;; to usurp one column for the > ;; continuation glyph. > (if (and (null shr-width) > - (or (zerop (fringe-columns > 'right)) > - (zerop (fringe-columns > 'left)))) > + (not (fringes-p))) > (* (frame-char-width) 2) > 0)))) > (shr-insert text) > -- > 2.6.3 > > > On Thu, Nov 12, 2015 at 4:17 PM Eric Hanchrow > wrote: > >> twb points out that I can (require 'fringe) to make the problem go away. >> > --001a1140cd06c0eb260524621436 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: base64 PGRpdiBkaXI9Imx0ciI+QWdhaW4sIGJ1dCBhcyBhbiBhdHRhY2htZW50Ljxicj48YnI+PGRpdiBj bGFzcz0iZ21haWxfcXVvdGUiPjxkaXYgZGlyPSJsdHIiPk9uIFRodSwgTm92IDEyLCAyMDE1IGF0 IDU6MjkgUE0gRXJpYyBIYW5jaHJvdyAmbHQ7PGEgaHJlZj0ibWFpbHRvOmVyaWMuaGFuY2hyb3dA Z21haWwuY29tIj5lcmljLmhhbmNocm93QGdtYWlsLmNvbTwvYT4mZ3Q7IHdyb3RlOjxicj48L2Rp dj48YmxvY2txdW90ZSBjbGFzcz0iZ21haWxfcXVvdGUiIHN0eWxlPSJtYXJnaW46MCAwIDAgLjhl eDtib3JkZXItbGVmdDoxcHggI2NjYyBzb2xpZDtwYWRkaW5nLWxlZnQ6MWV4Ij48ZGl2IGRpcj0i bHRyIj48ZGl2PjxzcGFuIHN0eWxlPSJsaW5lLWhlaWdodDoxLjUiPiogbGlzcC9uZXQvc2hyLmVs IChmcmluZ2VzLXApOjwvc3Bhbj48YnI+PC9kaXY+PGRpdj5OZXcgZnVuY3Rpb24uPC9kaXY+PGRp dj4oc2hyLWluc2VydC1kb2N1bWVudCwgc2hyLWZpbGwtdGV4dCk6IFVzZSBpdC48L2Rpdj48ZGl2 Pi0tLTwvZGl2PjxkaXY+wqBsaXNwL25ldC9zaHIuZWwgfCAxOSArKysrKysrKystLS0tLS0tLS0t PC9kaXY+PGRpdj7CoDEgZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9u cygtKTwvZGl2PjxkaXY+PGJyPjwvZGl2PjxkaXY+ZGlmZiAtLWdpdCBhL2xpc3AvbmV0L3Noci5l bCBiL2xpc3AvbmV0L3Noci5lbDwvZGl2PjxkaXY+aW5kZXggNThkZWFlYS4uODUzYjJmZCAxMDA2 NDQ8L2Rpdj48ZGl2Pi0tLSBhL2xpc3AvbmV0L3Noci5lbDwvZGl2PjxkaXY+KysrIGIvbGlzcC9u ZXQvc2hyLmVsPC9kaXY+PGRpdj5AQCAtMjAzLDYgKzIwMywxMiBAQCBjaWQ6IFVSTCBhcyB0aGUg YXJndW1lbnQuJnF1b3Q7KTwvZGl2PjxkaXY+wqAgwqAgwqAgwqAoZ290by1jaGFyIGJlZ2luKTwv ZGl2PjxkaXY+wqAgwqAgwqAgwqAoc2hyLWluc2VydC1kb2N1bWVudCBkb20pKSkpPC9kaXY+PGRp dj7CoDwvZGl2PjxkaXY+KyhkZWZ1biBmcmluZ2VzLXAgKCk8L2Rpdj48ZGl2PisgwqAmcXVvdDtS ZXR1cm4gdCBpZiBmcmluZ2UtY29sdW1ucyBpcyBib3VuZCwgYW5kIGVpdGhlciAoZnJpbmdlLWNv bHVtbnMgJiMzOTtsZWZ0KSBvciAoZnJpbmdlLWNvbHVtbnMgJiMzOTtyaWdodCkgcmV0dXJucyBu b256ZXJvLiZxdW90OzwvZGl2PjxkaXY+KyDCoChhbmQgKGZib3VuZHAgJiMzOTtmcmluZ2UtY29s dW1ucyk8L2Rpdj48ZGl2PisgwqAgwqAgwqAgKG9yIChub3QgKHplcm9wIChmcmluZ2UtY29sdW1u cyAmIzM5O3JpZ2h0KSkpPC9kaXY+PGRpdj4rIMKgIMKgIMKgIMKgIMKgIChub3QgKHplcm9wIChm cmluZ2UtY29sdW1ucyAmIzM5O2xlZnQpKSkpKSk8L2Rpdj48ZGl2Pis8L2Rpdj48ZGl2PsKgOzs7 IyMjYXV0b2xvYWQ8L2Rpdj48ZGl2PsKgKGRlZnVuIHNoci1pbnNlcnQtZG9jdW1lbnQgKGRvbSk8 L2Rpdj48ZGl2PsKgIMKgJnF1b3Q7UmVuZGVyIHRoZSBwYXJzZWQgZG9jdW1lbnQgRE9NIGludG8g dGhlIGN1cnJlbnQgYnVmZmVyLjwvZGl2PjxkaXY+QEAgLTIzMCwxOSArMjM2LDEzIEBAIERPTSBz aG91bGQgYmUgYSBwYXJzZSB0cmVlIGFzIGdlbmVyYXRlZCBieTwvZGl2PjxkaXY+wqA8c3BhbiBz dHlsZT0id2hpdGUtc3BhY2U6cHJlLXdyYXAiPgkJCQk8L3NwYW4+KGlmIChub3Qgc2hyLXVzZS1m b250cyk8L2Rpdj48ZGl2PsKgPHNwYW4gc3R5bGU9IndoaXRlLXNwYWNlOnByZS13cmFwIj4JCQkJ PC9zcGFuPiDCoCDCoCgtICh3aW5kb3ctYm9keS13aWR0aCkgMTwvZGl2PjxkaXY+wqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgKGlmIChh bmQgKG51bGwgc2hyLXdpZHRoKTwvZGl2PjxkaXY+LSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoChvciAoemVyb3A8 L2Rpdj48ZGl2Pi0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgKGZyaW5nZS1jb2x1bW5zICYjMzk7cmln aHQpKTwvZGl2PjxkaXY+LSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCh6ZXJvcDwvZGl2PjxkaXY+LSDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCAoZnJpbmdlLWNvbHVtbnMgJiMzOTtsZWZ0KSkpKTwvZGl2Pjxk aXY+KyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoChub3QgKGZyaW5nZXMtcCkpKTwvZGl2PjxkaXY+wqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg MDwvZGl2PjxkaXY+wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgMSkpPC9kaXY+PGRpdj7CoDxzcGFuIHN0eWxlPSJ3aGl0ZS1zcGFj ZTpwcmUtd3JhcCI+CQkJCTwvc3Bhbj4gwqAoLSAod2luZG93LWJvZHktd2lkdGggbmlsIHQpPC9k aXY+PGRpdj7CoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCAoKiAyIChmcmFtZS1jaGFyLXdpZHRoKSk8L2Rpdj48ZGl2PsKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIChpZiAoYW5kIChudWxs IHNoci13aWR0aCk8L2Rpdj48ZGl2Pi0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAob3IgKHplcm9wPC9kaXY+PGRpdj4t IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIChmcmluZ2UtY29sdW1ucyAmIzM5O3JpZ2h0KSk8L2Rpdj48ZGl2 Pi0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAoemVyb3A8L2Rpdj48ZGl2Pi0gwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg KGZyaW5nZS1jb2x1bW5zICYjMzk7bGVmdCkpKSk8L2Rpdj48ZGl2PisgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAobm90 IChmcmluZ2VzLXApKSk8L2Rpdj48ZGl2PsKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgICgqIChmcmFtZS1jaGFyLXdpZHRoKSAyKTwv ZGl2PjxkaXY+wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgMCkpKSkpKTwvZGl2PjxkaXY+wqAgwqAgwqAoc2hyLWRlc2NlbmQgZG9tKTwv ZGl2PjxkaXY+QEAgLTQ2Niw4ICs0NjYsNyBAQCBzaXplLCBhbmQgZnVsbC1idWZmZXIgc2l6ZS4m cXVvdDs8L2Rpdj48ZGl2PsKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIDs7IHRvIHVzdXJwIG9uZSBjb2x1bW4gZm9yIHRoZTwvZGl2PjxkaXY+wqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgOzsgY29u dGludWF0aW9uIGdseXBoLjwvZGl2PjxkaXY+wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgKGlmIChhbmQgKG51bGwgc2hyLXdpZHRoKTwvZGl2Pjxk aXY+LSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoChvciAoemVyb3AgKGZyaW5nZS1jb2x1bW5zICYjMzk7cmlnaHQpKTwvZGl2 PjxkaXY+LSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCh6ZXJvcCAoZnJpbmdlLWNvbHVtbnMgJiMzOTtsZWZ0KSkp KTwvZGl2PjxkaXY+KyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoChub3QgKGZyaW5nZXMtcCkpKTwvZGl2PjxkaXY+wqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgKCog KGZyYW1lLWNoYXItd2lkdGgpIDIpPC9kaXY+PGRpdj7CoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCAwKSkpKTwvZGl2PjxkaXY+wqA8c3BhbiBz dHlsZT0id2hpdGUtc3BhY2U6cHJlLXdyYXAiPgk8L3NwYW4+KHNoci1pbnNlcnQgdGV4dCk8L2Rp dj48L2Rpdj48ZGl2IGRpcj0ibHRyIj48ZGl2Pi0twqA8L2Rpdj48ZGl2PjIuNi4zPC9kaXY+PGRp dj48YnI+PC9kaXY+PGJyPjxkaXYgY2xhc3M9ImdtYWlsX3F1b3RlIj48ZGl2IGRpcj0ibHRyIj5P biBUaHUsIE5vdiAxMiwgMjAxNSBhdCA0OjE3IFBNIEVyaWMgSGFuY2hyb3cgJmx0OzxhIGhyZWY9 Im1haWx0bzplcmljLmhhbmNocm93QGdtYWlsLmNvbSIgdGFyZ2V0PSJfYmxhbmsiPmVyaWMuaGFu Y2hyb3dAZ21haWwuY29tPC9hPiZndDsgd3JvdGU6PGJyPjwvZGl2PjxibG9ja3F1b3RlIGNsYXNz PSJnbWFpbF9xdW90ZSIgc3R5bGU9Im1hcmdpbjowIDAgMCAuOGV4O2JvcmRlci1sZWZ0OjFweCAj Y2NjIHNvbGlkO3BhZGRpbmctbGVmdDoxZXgiPjxkaXYgZGlyPSJsdHIiPnR3YiBwb2ludHMgb3V0 IHRoYXQgSSBjYW4gKHJlcXVpcmUgJiMzOTtmcmluZ2UpIHRvIG1ha2UgdGhlIHByb2JsZW0gZ28g YXdheS48L2Rpdj48L2Jsb2NrcXVvdGU+PC9kaXY+PC9kaXY+PC9ibG9ja3F1b3RlPjwvZGl2Pjwv ZGl2Pg0K --001a1140cd06c0eb260524621436-- --001a1140cd06c0eb2d0524621438 Content-Type: application/octet-stream; name="0001-shr-don-t-invoke-unbound-function-Bug-21895.patch" Content-Disposition: attachment; filename="0001-shr-don-t-invoke-unbound-function-Bug-21895.patch" Content-Transfer-Encoding: base64 Content-ID: <150fe7beaf1904e1a9f1> X-Attachment-Id: 150fe7beaf1904e1a9f1 RnJvbSBmZmUyOTRkNzA2MTdmMWY1MzMxZjdmYWI5M2EyOWNhZmQwZWUwNzg3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFcmljIEhhbmNocm93IDxlcmljLmhhbmNocm93QGdtYWlsLmNv bT4KRGF0ZTogVGh1LCAxMiBOb3YgMjAxNSAxNzoyMzozNyAtMDgwMApTdWJqZWN0OiBbUEFUQ0hd IHNocjogZG9uJ3QgaW52b2tlIHVuYm91bmQgZnVuY3Rpb24gKEJ1ZyMyMTg5NSkKVG86IDIxODk1 QGRlYmJ1Z3MuZ251Lm9yZwoKKiBsaXNwL25ldC9zaHIuZWwgKGZyaW5nZXMtcCk6Ck5ldyBmdW5j dGlvbi4KKHNoci1pbnNlcnQtZG9jdW1lbnQsIHNoci1maWxsLXRleHQpOiBVc2UgaXQuCi0tLQog bGlzcC9uZXQvc2hyLmVsIHwgMTkgKysrKysrKysrLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQs IDkgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9uZXQv c2hyLmVsIGIvbGlzcC9uZXQvc2hyLmVsCmluZGV4IDU4ZGVhZWEuLjg1M2IyZmQgMTAwNjQ0Ci0t LSBhL2xpc3AvbmV0L3Noci5lbAorKysgYi9saXNwL25ldC9zaHIuZWwKQEAgLTIwMyw2ICsyMDMs MTIgQEAgY2lkOiBVUkwgYXMgdGhlIGFyZ3VtZW50LiIpCiAgICAgICAoZ290by1jaGFyIGJlZ2lu KQogICAgICAgKHNoci1pbnNlcnQtZG9jdW1lbnQgZG9tKSkpKQogCisoZGVmdW4gZnJpbmdlcy1w ICgpCisgICJSZXR1cm4gdCBpZiBmcmluZ2UtY29sdW1ucyBpcyBib3VuZCwgYW5kIGVpdGhlciAo ZnJpbmdlLWNvbHVtbnMgJ2xlZnQpIG9yIChmcmluZ2UtY29sdW1ucyAncmlnaHQpIHJldHVybnMg bm9uemVyby4iCisgIChhbmQgKGZib3VuZHAgJ2ZyaW5nZS1jb2x1bW5zKQorICAgICAgIChvciAo bm90ICh6ZXJvcCAoZnJpbmdlLWNvbHVtbnMgJ3JpZ2h0KSkpCisgICAgICAgICAgIChub3QgKHpl cm9wIChmcmluZ2UtY29sdW1ucyAnbGVmdCkpKSkpKQorCiA7OzsjIyNhdXRvbG9hZAogKGRlZnVu IHNoci1pbnNlcnQtZG9jdW1lbnQgKGRvbSkKICAgIlJlbmRlciB0aGUgcGFyc2VkIGRvY3VtZW50 IERPTSBpbnRvIHRoZSBjdXJyZW50IGJ1ZmZlci4KQEAgLTIzMCwxOSArMjM2LDEzIEBAIERPTSBz aG91bGQgYmUgYSBwYXJzZSB0cmVlIGFzIGdlbmVyYXRlZCBieQogCQkJCShpZiAobm90IHNoci11 c2UtZm9udHMpCiAJCQkJICAgICgtICh3aW5kb3ctYm9keS13aWR0aCkgMQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKGlmIChhbmQgKG51bGwgc2hyLXdpZHRoKQotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG9yICh6ZXJvcAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZnJp bmdlLWNvbHVtbnMgJ3JpZ2h0KSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAoemVyb3AKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKGZyaW5nZS1jb2x1bW5zICdsZWZ0KSkpKQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG5vdCAoZnJpbmdlcy1wKSkp CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAxKSkKIAkJCQkgICgtICh3aW5kb3ctYm9k eS13aWR0aCBuaWwgdCkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoKiAy IChmcmFtZS1jaGFyLXdpZHRoKSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAoaWYgKGFuZCAobnVsbCBzaHItd2lkdGgpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKG9yICh6ZXJvcAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKGZyaW5nZS1jb2x1bW5zICdyaWdodCkpCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICh6ZXJvcAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGZyaW5nZS1jb2x1 bW5zICdsZWZ0KSkpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIChub3QgKGZyaW5nZXMtcCkpKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAoKiAoZnJhbWUtY2hhci13aWR0aCkgMikKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIDApKSkpKSkKICAgICAoc2hyLWRlc2NlbmQgZG9tKQpAQCAtNDY2LDgg KzQ2Niw3IEBAIHNpemUsIGFuZCBmdWxsLWJ1ZmZlciBzaXplLiIKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgOzsgdG8gdXN1cnAgb25lIGNvbHVtbiBmb3IgdGhlCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDs7IGNvbnRpbnVhdGlvbiBnbHlwaC4KICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGlmIChhbmQgKG51bGwgc2hyLXdpZHRoKQot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAob3IgKHplcm9wIChm cmluZ2UtY29sdW1ucyAncmlnaHQpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKHplcm9wIChmcmluZ2UtY29sdW1ucyAnbGVmdCkpKSkKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG5vdCAoZnJpbmdlcy1wKSkpCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoKiAoZnJhbWUtY2hhci13aWR0 aCkgMikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAwKSkpKQogCShzaHIt aW5zZXJ0IHRleHQpCi0tIAoyLjYuMwoK --001a1140cd06c0eb2d0524621438--