From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: grischka Newsgroups: gmane.emacs.bugs Subject: bug#7190: Crash in menus on w32 Date: Thu, 21 Oct 2010 13:11:25 +0200 Message-ID: <4CC01FDD.5060707@gmx.de> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060302020304000406010904" X-Trace: dough.gmane.org 1287659577 5498 80.91.229.12 (21 Oct 2010 11:12:57 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 21 Oct 2010 11:12:57 +0000 (UTC) Cc: bug-gnu-emacs@gnu.org To: lennart.borgman@gmail.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Oct 21 13:12:55 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1P8t4n-00041W-OE for geb-bug-gnu-emacs@m.gmane.org; Thu, 21 Oct 2010 13:12:54 +0200 Original-Received: from localhost ([127.0.0.1]:52145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P8t4n-0004Kc-0W for geb-bug-gnu-emacs@m.gmane.org; Thu, 21 Oct 2010 07:12:53 -0400 Original-Received: from [140.186.70.92] (port=37865 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P8t4c-0004KN-6K for bug-gnu-emacs@gnu.org; Thu, 21 Oct 2010 07:12:43 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P8t4a-0004ZC-4I for bug-gnu-emacs@gnu.org; Thu, 21 Oct 2010 07:12:41 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:42912) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P8t4a-0004Z4-2d for bug-gnu-emacs@gnu.org; Thu, 21 Oct 2010 07:12:40 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1P8t06-0004ba-8L; Thu, 21 Oct 2010 07:08:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: grischka Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 21 Oct 2010 11:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 7190 X-GNU-PR-Package: emacs,w32 X-GNU-PR-Keywords: Original-Received: via spool by submit@debbugs.gnu.org id=B.128765927917694 (code B ref -1); Thu, 21 Oct 2010 11:08:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 21 Oct 2010 11:07:59 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P8t02-0004bL-7i for submit@debbugs.gnu.org; Thu, 21 Oct 2010 07:07:58 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P8szz-0004bE-AO for submit@debbugs.gnu.org; Thu, 21 Oct 2010 07:07:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P8t3f-0004Gf-Ns for submit@debbugs.gnu.org; Thu, 21 Oct 2010 07:11:45 -0400 Original-Received: from lists.gnu.org ([199.232.76.165]:39542) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P8t3f-0004Gb-K0 for submit@debbugs.gnu.org; Thu, 21 Oct 2010 07:11:43 -0400 Original-Received: from [140.186.70.92] (port=37084 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P8t3d-0004DH-FC for bug-gnu-emacs@gnu.org; Thu, 21 Oct 2010 07:11:43 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P8t3b-0004Ew-NH for bug-gnu-emacs@gnu.org; Thu, 21 Oct 2010 07:11:41 -0400 Original-Received: from mailout-de.gmx.net ([213.165.64.22]:47321 helo=mail.gmx.net) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1P8t3b-0004Dn-CK for bug-gnu-emacs@gnu.org; Thu, 21 Oct 2010 07:11:39 -0400 Original-Received: (qmail invoked by alias); 21 Oct 2010 11:11:35 -0000 Original-Received: from unknown (EHLO [10.74.61.191]) [82.113.106.193] by mail.gmx.net (mp066) with SMTP; 21 Oct 2010 13:11:35 +0200 X-Authenticated: #18588216 X-Provags-ID: V01U2FsdGVkX18TIgAzMloTFofgHr7WgcgWLWnVJpKw4OJEBEByo3 GatQYJyEosVeOR User-Agent: Thunderbird 2.0.0.23 (Windows/20090812) Original-References: AANLkTinuGH5MJ6Z4NMBUjkDpqJwmQy6mY4JBcWcVSuXS@mail.gmail.com X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Thu, 21 Oct 2010 07:08:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:41030 Archived-At: This is a multi-part message in MIME format. --------------060302020304000406010904 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Here's a patch that fixes the bug. Actually 4 bugs: 1) the initial cause: was freeing items prematurely and trying to free already freed items 2) memory leak: was trying to free items from already deleted menu 3) memory leak: was trying to free menu from already deleted window 4) other: was trying to set cursor in window with no associated frame --- grischka --------------060302020304000406010904 Content-Type: text/plain; name="free-menu-strings.diff" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="free-menu-strings.diff" Y29tbWl0IDA2NDIyNWRiNzg2NDBhMWZiNDhiNjhhYWM2MDNjOGUwNWNjNjliODAKQXV0aG9y OiBncmlzY2hrYSA8Z3Jpc2Noa2E+CkRhdGU6ICAgVGh1IE9jdCAxNCAxMzoyMzozOCAyMDEw ICswMjAwCgogICAgZml4IHczMm1lbnUgb3duZXJkcmF3IHN0cmluZyBhbGxvYy9mcmVlCgpk aWZmIC0tZ2l0IGEvc3JjL3czMmZucy5jIGIvc3JjL3czMmZucy5jCmluZGV4IDgwODUwMzUu LjgzZDU3N2UgMTAwNjQ0Ci0tLSBhL3NyYy93MzJmbnMuYworKysgYi9zcmMvdzMyZm5zLmMK QEAgLTc2LDcgKzc2LDYgQEAgZXh0ZXJuIHZvaWQgZnJlZV9mcmFtZV9tZW51YmFyIChzdHJ1 Y3QgZnJhbWUgKik7CiBleHRlcm4gZG91YmxlIGF0b2YgKGNvbnN0IGNoYXIgKik7CiBleHRl cm4gaW50IHczMl9jb25zb2xlX3RvZ2dsZV9sb2NrX2tleSAoaW50LCBMaXNwX09iamVjdCk7 CiBleHRlcm4gdm9pZCB3MzJfbWVudV9kaXNwbGF5X2hlbHAgKEhXTkQsIEhNRU5VLCBVSU5U LCBVSU5UKTsKLWV4dGVybiB2b2lkIHczMl9mcmVlX21lbnVfc3RyaW5ncyAoSFdORCk7CiBl eHRlcm4gY29uc3QgY2hhciAqbWFwX3czMl9maWxlbmFtZSAoY29uc3QgY2hhciAqLCBjb25z dCBjaGFyICoqKTsKIAogZXh0ZXJuIGludCBxdWl0X2NoYXI7CkBAIC0yODAsMTIgKzI3OSw3 IEBAIHVuc2lnbmVkIGludCBtc2hfbW91c2V3aGVlbCA9IDA7CiAvKiBUaW1lcnMgKi8KICNk ZWZpbmUgTU9VU0VfQlVUVE9OX0lECTEKICNkZWZpbmUgTU9VU0VfTU9WRV9JRAkyCi0jZGVm aW5lIE1FTlVfRlJFRV9JRCAzCiAjZGVmaW5lIEhPVVJHTEFTU19JRCA0Ci0vKiBUaGUgZGVs YXkgKG1pbGxpc2Vjb25kcykgYmVmb3JlIGEgbWVudSBpcyBmcmVlZCBhZnRlciBXTV9FWElU TUVOVUxPT1AKLSAgIGlzIHJlY2VpdmVkLiAgKi8KLSNkZWZpbmUgTUVOVV9GUkVFX0RFTEFZ IDEwMDAKLXN0YXRpYyB1bnNpZ25lZCBtZW51X2ZyZWVfdGltZXIgPSAwOwogCiAvKiBJbiBk aXNwbmV3LmMgKi8KIApAQCAtMzM4NywyMSArMzM4MSw2IEBAIHczMl93bmRfcHJvYyAoSFdO RCBod25kLCBVSU5UIG1zZywgV1BBUkFNIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSkKIAkgIEtp bGxUaW1lciAoaHduZCwgbW91c2VfbW92ZV90aW1lcik7CiAJICBtb3VzZV9tb3ZlX3RpbWVy ID0gMDsKIAl9Ci0gICAgICBlbHNlIGlmICh3UGFyYW0gPT0gbWVudV9mcmVlX3RpbWVyKQot CXsKLQkgIEtpbGxUaW1lciAoaHduZCwgbWVudV9mcmVlX3RpbWVyKTsKLQkgIG1lbnVfZnJl ZV90aW1lciA9IDA7Ci0JICBmID0geF93aW5kb3dfdG9fZnJhbWUgKGRweWluZm8sIGh3bmQp OwotICAgICAgICAgIC8qIElmIGEgcG9wdXAgbWVudSBpcyBhY3RpdmUsIGRvbid0IHdpcGUg aXRzIHN0cmluZ3MuICAqLwotCSAgaWYgKG1lbnViYXJfaW5fdXNlCi0gICAgICAgICAgICAg ICYmIGN1cnJlbnRfcG9wdXBfbWVudSA9PSBOVUxMKQotCSAgICB7Ci0JICAgICAgLyogRnJl ZSBtZW1vcnkgdXNlZCBieSBvd25lci1kcmF3biBhbmQgaGVscC1lY2hvIHN0cmluZ3MuICAq LwotCSAgICAgIHczMl9mcmVlX21lbnVfc3RyaW5ncyAoaHduZCk7Ci0JICAgICAgZi0+b3V0 cHV0X2RhdGEudzMyLT5tZW51YmFyX2FjdGl2ZSA9IDA7Ci0gICAgICAgICAgICAgIG1lbnVi YXJfaW5fdXNlID0gMDsKLQkgICAgfQotCX0KICAgICAgIGVsc2UgaWYgKHdQYXJhbSA9PSBo b3VyZ2xhc3NfdGltZXIpCiAJewogCSAgS2lsbFRpbWVyIChod25kLCBob3VyZ2xhc3NfdGlt ZXIpOwpAQCAtMzQ2NSwxNCArMzQ0NCwxMSBAQCB3MzJfd25kX3Byb2MgKEhXTkQgaHduZCwg VUlOVCBtc2csIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCiAgICAgY2FzZSBXTV9F WElUTUVOVUxPT1A6CiAgICAgICBmID0geF93aW5kb3dfdG9fZnJhbWUgKGRweWluZm8sIGh3 bmQpOwogCi0gICAgICAvKiBJZiBhIG1lbnUgaXMgc3RpbGwgYWN0aXZlLCBjaGVjayBhZ2Fp biBhZnRlciBhIHNob3J0IGRlbGF5LAotCSBzaW5jZSBXaW5kb3dzIG9mdGVuIChhbHdheXM/ KSBzZW5kcyB0aGUgV01fRVhJVE1FTlVMT09QCi0JIGJlZm9yZSB0aGUgY29ycmVzcG9uZGlu ZyBXTV9DT01NQU5EIG1lc3NhZ2UuCi0gICAgICAgICBEb24ndCBkbyB0aGlzIGlmIGEgcG9w dXAgbWVudSBpcyBhY3RpdmUsIHNpbmNlIGl0IGlzIG9ubHkKLSAgICAgICAgIG1lbnViYXIg bWVudXMgdGhhdCByZXF1aXJlIGNsZWFuaW5nIHVwIGluIHRoaXMgd2F5LgotICAgICAgKi8K ICAgICAgIGlmIChmICYmIG1lbnViYXJfaW5fdXNlICYmIGN1cnJlbnRfcG9wdXBfbWVudSA9 PSBOVUxMKQotCW1lbnVfZnJlZV90aW1lciA9IFNldFRpbWVyIChod25kLCBNRU5VX0ZSRUVf SUQsIE1FTlVfRlJFRV9ERUxBWSwgTlVMTCk7CisgICAgICAgeworICAgICAgICAgZi0+b3V0 cHV0X2RhdGEudzMyLT5tZW51YmFyX2FjdGl2ZSA9IDA7CisgICAgICAgICBtZW51YmFyX2lu X3VzZSA9IDA7CisgICAgICAgfQogCiAgICAgICAvKiBJZiBob3VyZ2xhc3MgY3Vyc29yIHNo b3VsZCBiZSBkaXNwbGF5ZWQsIGRpc3BsYXkgaXQgbm93LiAgKi8KICAgICAgIGlmIChmICYm IGYtPm91dHB1dF9kYXRhLnczMi0+aG91cmdsYXNzX3ApCkBAIC0zNjMyLDE1ICszNjA4LDYg QEAgdzMyX3duZF9wcm9jIChIV05EIGh3bmQsIFVJTlQgbXNnLCBXUEFSQU0gd1BhcmFtLCBM UEFSQU0gbFBhcmFtKQogICAgICAgZ290byBjb21tYW5kOwogICAgIGNhc2UgV01fQ09NTUFO RDoKICAgICAgIG1lbnViYXJfaW5fdXNlID0gMDsKLSAgICAgIGYgPSB4X3dpbmRvd190b19m cmFtZSAoZHB5aW5mbywgaHduZCk7Ci0gICAgICBpZiAoZiAmJiBISVdPUkQgKHdQYXJhbSkg PT0gMCkKLQl7Ci0JICBpZiAobWVudV9mcmVlX3RpbWVyKQotCSAgICB7Ci0JICAgICAgS2ls bFRpbWVyIChod25kLCBtZW51X2ZyZWVfdGltZXIpOwotCSAgICAgIG1lbnVfZnJlZV90aW1l ciA9IDA7Ci0JICAgIH0KLQl9CiAgICAgY2FzZSBXTV9NT1ZFOgogICAgIGNhc2UgV01fU0la RToKICAgICBjb21tYW5kOgpAQCAtMzc0OCw2ICszNzE1LDggQEAgdzMyX3duZF9wcm9jIChI V05EIGh3bmQsIFVJTlQgbXNnLCBXUEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBhcmFtKQogICAg ICAgaWYgKExPV09SRCAobFBhcmFtKSA9PSBIVENMSUVOVCkKIAl7CiAJICBmID0geF93aW5k b3dfdG9fZnJhbWUgKGRweWluZm8sIGh3bmQpOworCSAgaWYgKCFmKQorCSAgICByZXR1cm4g MDsKIAkgIGlmIChmLT5vdXRwdXRfZGF0YS53MzItPmhvdXJnbGFzc19wICYmICFtZW51YmFy X2luX3VzZQogCSAgICAgICYmICFjdXJyZW50X3BvcHVwX21lbnUpCiAJICAgIFNldEN1cnNv ciAoZi0+b3V0cHV0X2RhdGEudzMyLT5ob3VyZ2xhc3NfY3Vyc29yKTsKZGlmZiAtLWdpdCBh L3NyYy93MzJtZW51LmMgYi9zcmMvdzMybWVudS5jCmluZGV4IGZmNmJkOTcuLjc4ZDU5ZmMg MTAwNjQ0Ci0tLSBhL3NyYy93MzJtZW51LmMKKysrIGIvc3JjL3czMm1lbnUuYwpAQCAtMTA4 LDcgKzEwOCw3IEBAIHN0YXRpYyBMaXNwX09iamVjdCBzaW1wbGVfZGlhbG9nX3Nob3cgKEZS QU1FX1BUUiwgTGlzcF9PYmplY3QsIExpc3BfT2JqZWN0KTsKIHN0YXRpYyB2b2lkIHV0Zjh0 bzE2ICh1bnNpZ25lZCBjaGFyICosIGludCwgV0NIQVIgKik7CiBzdGF0aWMgaW50IGZpbGxf aW5fbWVudSAoSE1FTlUsIHdpZGdldF92YWx1ZSAqKTsKIAotdm9pZCB3MzJfZnJlZV9tZW51 X3N0cmluZ3MgKEhXTkQpOworc3RhdGljIHZvaWQgdzMyX2ZyZWVfbWVudV9zdHJpbmdzIChI TUVOVSk7CiAMCiAKIC8qIFRoaXMgaXMgc2V0IG5vbnplcm8gYWZ0ZXIgdGhlIHVzZXIgYWN0 aXZhdGVzIHRoZSBtZW51IGJhciwgYW5kIHNldApAQCAtMzQ3LDggKzM0Nyw2IEBAIG1lbnVi YXJfc2VsZWN0aW9uX2NhbGxiYWNrIChGUkFNRV9QVFIgZiwgdm9pZCAqIGNsaWVudF9kYXRh KQogCSAgICAgIGJ1Zi5raW5kID0gTUVOVV9CQVJfRVZFTlQ7CiAJICAgICAgYnVmLmZyYW1l X29yX3dpbmRvdyA9IGZyYW1lOwogCSAgICAgIGJ1Zi5hcmcgPSBlbnRyeTsKLQkgICAgICAv KiBGcmVlIG1lbW9yeSB1c2VkIGJ5IG93bmVyLWRyYXduIGFuZCBoZWxwLWVjaG8gc3RyaW5n cy4gICovCi0JICAgICAgdzMyX2ZyZWVfbWVudV9zdHJpbmdzIChGUkFNRV9XMzJfV0lORE9X IChmKSk7CiAJICAgICAga2JkX2J1ZmZlcl9zdG9yZV9ldmVudCAoJmJ1Zik7CiAKIAkgICAg ICBmLT5vdXRwdXRfZGF0YS53MzItPm1lbnViYXJfYWN0aXZlID0gMDsKQEAgLTM1Nyw4ICsz NTUsNiBAQCBtZW51YmFyX3NlbGVjdGlvbl9jYWxsYmFjayAoRlJBTUVfUFRSIGYsIHZvaWQg KiBjbGllbnRfZGF0YSkKIAkgIGkgKz0gTUVOVV9JVEVNU19JVEVNX0xFTkdUSDsKIAl9CiAg ICAgfQotICAvKiBGcmVlIG1lbW9yeSB1c2VkIGJ5IG93bmVyLWRyYXduIGFuZCBoZWxwLWVj aG8gc3RyaW5ncy4gICovCi0gIHczMl9mcmVlX21lbnVfc3RyaW5ncyAoRlJBTUVfVzMyX1dJ TkRPVyAoZikpOwogICBmLT5vdXRwdXRfZGF0YS53MzItPm1lbnViYXJfYWN0aXZlID0gMDsK IH0KIApAQCAtNTg4LDYgKzU4NCw3IEBAIHNldF9mcmFtZV9tZW51YmFyIChGUkFNRV9QVFIg ZiwgaW50IGZpcnN0X3RpbWUsIGludCBkZWVwX3ApCiAKICAgaWYgKG1lbnViYXJfd2lkZ2V0 KQogICAgIHsKKyAgICAgIHczMl9mcmVlX21lbnVfc3RyaW5ncyAobWVudWJhcl93aWRnZXQp OwogICAgICAgLyogRW1wdHkgY3VycmVudCBtZW51YmFyLCByYXRoZXIgdGhhbiBjcmVhdGlu ZyBhIGZyZXNoIG9uZS4gICovCiAgICAgICB3aGlsZSAoRGVsZXRlTWVudSAobWVudWJhcl93 aWRnZXQsIDAsIE1GX0JZUE9TSVRJT04pKQogCTsKQEAgLTY0Myw2ICs2NDAsNyBAQCBmcmVl X2ZyYW1lX21lbnViYXIgKEZSQU1FX1BUUiBmKQogICAgIEhNRU5VIG9sZCA9IEdldE1lbnUg KEZSQU1FX1czMl9XSU5ET1cgKGYpKTsKICAgICBTZXRNZW51IChGUkFNRV9XMzJfV0lORE9X IChmKSwgTlVMTCk7CiAgICAgZi0+b3V0cHV0X2RhdGEudzMyLT5tZW51YmFyX3dpZGdldCA9 IE5VTEw7CisgICAgdzMyX2ZyZWVfbWVudV9zdHJpbmdzIChvbGQpOwogICAgIERlc3Ryb3lN ZW51IChvbGQpOwogICB9CiAKQEAgLTg5OCwxMCArODk2LDExIEBAIHczMl9tZW51X3Nob3cg KEZSQU1FX1BUUiBmLCBpbnQgeCwgaW50IHksIGludCBmb3JfY2xpY2ssIGludCBrZXltYXBz LAogICAvKiBGcmVlIHRoZSB3aWRnZXRfdmFsdWUgb2JqZWN0cyB3ZSB1c2VkIHRvIHNwZWNp ZnkgdGhlIGNvbnRlbnRzLiAgKi8KICAgZnJlZV9tZW51YmFyX3dpZGdldF92YWx1ZV90cmVl IChmaXJzdF93dik7CiAKKyAgLyogRnJlZSB0aGUgb3duZXItZHJhd24gYW5kIGhlbHAtZWNo byBtZW51IHN0cmluZ3MuICAqLworICB3MzJfZnJlZV9tZW51X3N0cmluZ3MgKG1lbnUpOwog ICBEZXN0cm95TWVudSAobWVudSk7CisgIGN1cnJlbnRfcG9wdXBfbWVudSA9IE5VTEw7CiAK LSAgLyogRnJlZSB0aGUgb3duZXItZHJhd24gYW5kIGhlbHAtZWNobyBtZW51IHN0cmluZ3Mu ICAqLwotICB3MzJfZnJlZV9tZW51X3N0cmluZ3MgKEZSQU1FX1czMl9XSU5ET1cgKGYpKTsK ICAgZi0+b3V0cHV0X2RhdGEudzMyLT5tZW51YmFyX2FjdGl2ZSA9IDA7CiAKICAgLyogRmlu ZCB0aGUgc2VsZWN0ZWQgaXRlbSwgYW5kIGl0cyBwYW5lLCB0byByZXR1cm4KQEAgLTE2NTEs OSArMTY1MCwxMSBAQCB3MzJfbWVudV9kaXNwbGF5X2hlbHAgKEhXTkQgb3duZXIsIEhNRU5V IG1lbnUsIFVJTlQgaXRlbSwgVUlOVCBmbGFncykKIAogLyogRnJlZSBtZW1vcnkgdXNlZCBi eSBvd25lci1kcmF3biBzdHJpbmdzLiAgKi8KIHN0YXRpYyB2b2lkCi13MzJfZnJlZV9zdWJt ZW51X3N0cmluZ3MgKEhNRU5VIG1lbnUpCit3MzJfZnJlZV9tZW51X3N0cmluZ3MgKEhNRU5V IG1lbnUpCiB7CiAgIGludCBpLCBudW0gPSBHZXRNZW51SXRlbUNvdW50IChtZW51KTsKKyAg aWYgKCFnZXRfbWVudV9pdGVtX2luZm8pCisgICAgcmV0dXJuOwogICBmb3IgKGkgPSAwOyBp IDwgbnVtOyBpKyspCiAgICAgewogICAgICAgTUVOVUlURU1JTkZPIGluZm87CkBAIC0xNjc0 LDI5ICsxNjc1LDEwIEBAIHczMl9mcmVlX3N1Ym1lbnVfc3RyaW5ncyAoSE1FTlUgbWVudSkK IAogICAgICAgLyogUmVjdXJzZSBkb3duIHN1Ym1lbnVzLiAgKi8KICAgICAgIGlmIChpbmZv LmhTdWJNZW51KQotCXczMl9mcmVlX3N1Ym1lbnVfc3RyaW5ncyAoaW5mby5oU3ViTWVudSk7 CisJdzMyX2ZyZWVfbWVudV9zdHJpbmdzIChpbmZvLmhTdWJNZW51KTsKICAgICB9CiB9CiAK LXZvaWQKLXczMl9mcmVlX21lbnVfc3RyaW5ncyAoSFdORCBod25kKQotewotICBITUVOVSBt ZW51ID0gY3VycmVudF9wb3B1cF9tZW51OwotCi0gIGlmIChnZXRfbWVudV9pdGVtX2luZm8p Ci0gICAgewotICAgICAgLyogSWYgdGhlcmUgaXMgbm8gcG9wdXAgbWVudSBhY3RpdmUsIGZy ZWUgdGhlIHN0cmluZ3MgZnJvbSB0aGUgZnJhbWUncwotCSBtZW51YmFyLiAgKi8KLSAgICAg IGlmICghbWVudSkKLQltZW51ID0gR2V0TWVudSAoaHduZCk7Ci0KLSAgICAgIGlmIChtZW51 KQotCXczMl9mcmVlX3N1Ym1lbnVfc3RyaW5ncyAobWVudSk7Ci0gICAgfQotCi0gIGN1cnJl bnRfcG9wdXBfbWVudSA9IE5VTEw7Ci19Ci0KICNlbmRpZiAvKiBIQVZFX01FTlVTICovCiAK IC8qIFRoZSBmb2xsb3dpbmcgaXMgdXNlZCBieSBkZWxheWVkIHdpbmRvdyBhdXRvc2VsZWN0 aW9uLiAgKi8KZGlmZiAtLWdpdCBhL3NyYy93MzJ0ZXJtLmMgYi9zcmMvdzMydGVybS5jCmlu ZGV4IDFmNTM4NjAuLjBjZWYxYjcgMTAwNjQ0Ci0tLSBhL3NyYy93MzJ0ZXJtLmMKKysrIGIv c3JjL3czMnRlcm0uYwpAQCAtNTczNCwxMSArNTczNCwxMSBAQCB4X2ZyZWVfZnJhbWVfcmVz b3VyY2VzIChzdHJ1Y3QgZnJhbWUgKmYpCiAgIGlmIChGUkFNRV9GQUNFX0NBQ0hFIChmKSkK ICAgICBmcmVlX2ZyYW1lX2ZhY2VzIChmKTsKIAorICBmcmVlX2ZyYW1lX21lbnViYXIgKGYp OworCiAgIGlmIChGUkFNRV9XMzJfV0lORE9XIChmKSkKICAgICBteV9kZXN0cm95X3dpbmRv dyAoZiwgRlJBTUVfVzMyX1dJTkRPVyAoZikpOwogCi0gIGZyZWVfZnJhbWVfbWVudWJhciAo Zik7Ci0KICAgdW5sb2FkX2NvbG9yIChmLCBGUkFNRV9GT1JFR1JPVU5EX1BJWEVMIChmKSk7 CiAgIHVubG9hZF9jb2xvciAoZiwgRlJBTUVfQkFDS0dST1VORF9QSVhFTCAoZikpOwogICB1 bmxvYWRfY29sb3IgKGYsIGYtPm91dHB1dF9kYXRhLnczMi0+Y3Vyc29yX3BpeGVsKTsK --------------060302020304000406010904--