From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#71525: 30.0.50; Spin in delete-region/interval_deletion_adjustment Spin in delete-region/interval_deletion_adjustment) Date: Fri, 14 Jun 2024 02:41:15 +0300 Message-ID: References: <87y17a55ny.fsf@stebalien.com> <87ikydo246.fsf@stebalien.com> <86o785z8wl.fsf@gnu.org> <87tthwrh8h.fsf@stebalien.com> <867ceszvp1.fsf@gnu.org> <87r0d0rfxa.fsf@stebalien.com> <87bk44bzf4.fsf@stebalien.com> <8634pgztx0.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------j06g2iyqR4HwhjqSSwTQAkIw" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="1176"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla Thunderbird Cc: jporterbugs@gmail.com, 71525@debbugs.gnu.org To: Eli Zaretskii , Steven Allen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jun 14 01:42:18 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sHu5B-00005o-7u for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 14 Jun 2024 01:42:18 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHu4z-0004dE-Km; Thu, 13 Jun 2024 19:42:05 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sHu4w-0004Vo-Qo for bug-gnu-emacs@gnu.org; Thu, 13 Jun 2024 19:42:02 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sHu4w-0003tI-HF for bug-gnu-emacs@gnu.org; Thu, 13 Jun 2024 19:42:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sHu4v-0003Yu-TH for bug-gnu-emacs@gnu.org; Thu, 13 Jun 2024 19:42:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 13 Jun 2024 23:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71525 X-GNU-PR-Package: emacs Original-Received: via spool by 71525-submit@debbugs.gnu.org id=B71525.171832208613649 (code B ref 71525); Thu, 13 Jun 2024 23:42:01 +0000 Original-Received: (at 71525) by debbugs.gnu.org; 13 Jun 2024 23:41:26 +0000 Original-Received: from localhost ([127.0.0.1]:39421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sHu4M-0003Y5-59 for submit@debbugs.gnu.org; Thu, 13 Jun 2024 19:41:26 -0400 Original-Received: from fhigh3-smtp.messagingengine.com ([103.168.172.154]:50585) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sHu4J-0003Xq-VD for 71525@debbugs.gnu.org; Thu, 13 Jun 2024 19:41:24 -0400 Original-Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 0B45C11401D2; Thu, 13 Jun 2024 19:41:19 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 13 Jun 2024 19:41:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1718322079; x=1718408479; bh=hvZCwgT5wb p2GGyCe9iNuo0Rlw1wCSYlXb7qSkrM56c=; b=KZ3gD5VY7W9m4JzJqxe4Oe8Cgm Cc+PDQyUm1YppAAz4mC1gynPxs3V+ResdF6K56PLt1B+Lq/OtiIjseMYEIR0qqWe DmsyAUBkaiZa9k4zMu9WANB+8mQEOdR7rqwQQBMzINJydmyXLyU3WDu5YiZUglBe T9v05WPKpB1PxxXsMOg3mOB8y5gL0f3K47HkyShE0EyyVX1hnyPSRPMX8FW4ZScc 8BQuKg1HK1GOmaQP+eg+C8HDYabjFS6+Vv1WDBMw8iWwaSjmJFmXOW4TunywkMLA +dTvMspav8Z+2sI/vL6ZSL5nSrLt5Yhqxr4eXGKd0r5B3XHDeYWLOCLJuYHw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1718322079; x=1718408479; bh=hvZCwgT5wbp2GGyCe9iNuo0Rlw1w CSYlXb7qSkrM56c=; b=f7sEHDEngjac5QPVJpofchERLVHZnRO5vSYtpLjVnvCi XHWVRLQkujpeinD9+PoyWbpLlH44rPCs6vGDmK3adeed/pd7VZrztBibmLj5X00p tkv4VGrN9aFPo0plm3KJMNKISQyVlQT6+EQ+QA/54gQ3/xgHOjP08bFZQmqGbVLF /27UZLSilsxc3Em8Bi8tkmXBFVmhbvD2fKj9UuJEOULL9EjF/ITKq97U33zAwZz+ WdA7tk9tBNL0jHBcdo1F2D5nKdSUDZXEYd7kbGUvz9xPOZqC5/adqSdg9Fmqaoha 9jHcthad5iVq0JEBlBqqZzG3+PIJd42uEhNxa3mAKg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedukedgvdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurheptgfkffggfgfuhffvvehfjgesmhdtreertddvjeenucfhrhhomhepffhmihht rhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvghvqeenucggtffrrghtth gvrhhnpedtvdeugedvteelvdegvefguedtgfethefggeffkedtkeegveeifeeiudejueff ffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegumh hithhrhiesghhuthhovhdruggvvh X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 13 Jun 2024 19:41:17 -0400 (EDT) Content-Language: en-US In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:287211 Archived-At: This is a multi-part message in MIME format. --------------j06g2iyqR4HwhjqSSwTQAkIw Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 14/06/2024 00:47, Dmitry Gutov wrote: > The thing is, decode_coding_c_string already calls > adjust_markers_for_insert through > >   decode_coding_object->decode_coding->produce_chars->insert_from_gap > > And the extra call moves the markers too far. > > Unfortunately, it's called with BEFORE_MARKERS=nil, and the above call > chain makes it difficult to pass through the extra argument. We can do it through the coding_system structure, though. See attached. It fixes the freezes in my testing. It seems like the least invasive possible fix, but better suggestions welcome. --------------j06g2iyqR4HwhjqSSwTQAkIw Content-Type: text/x-patch; charset=UTF-8; name="dst_before_markers.diff" Content-Disposition: attachment; filename="dst_before_markers.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3NyYy9jb2RpbmcuYyBiL3NyYy9jb2RpbmcuYwppbmRleCA1ZTRlOTJl YTZlMi4uMTM4YWFhMjJlNmEgMTAwNjQ0Ci0tLSBhL3NyYy9jb2RpbmcuYworKysgYi9zcmMv Y29kaW5nLmMKQEAgLTU2OTgsNiArNTY5OCw3IEBAIHNldHVwX2NvZGluZ19zeXN0ZW0gKExp c3BfT2JqZWN0IGNvZGluZ19zeXN0ZW0sIHN0cnVjdCBjb2Rpbmdfc3lzdGVtICpjb2Rpbmcp CiAgIGNvZGluZy0+ZGVmYXVsdF9jaGFyID0gWEZJWE5VTSAoQ09ESU5HX0FUVFJfREVGQVVM VF9DSEFSIChhdHRycykpOwogICBjb2RpbmctPmNhcnJ5b3Zlcl9ieXRlcyA9IDA7CiAgIGNv ZGluZy0+cmF3X2Rlc3RpbmF0aW9uID0gMDsKKyAgY29kaW5nLT5kc3RfYmVmb3JlX21hcmtl cnMgPSAwOwogCiAgIGNvZGluZ190eXBlID0gQ09ESU5HX0FUVFJfVFlQRSAoYXR0cnMpOwog ICBpZiAoRVEgKGNvZGluZ190eXBlLCBRdW5kZWNpZGVkKSkKQEAgLTcyMDksNyArNzIxMCw3 IEBAIHByb2R1Y2VfY2hhcnMgKHN0cnVjdCBjb2Rpbmdfc3lzdGVtICpjb2RpbmcsIExpc3Bf T2JqZWN0IHRyYW5zbGF0aW9uX3RhYmxlLAogCiAgIHByb2R1Y2VkID0gZHN0IC0gKGNvZGlu Zy0+ZGVzdGluYXRpb24gKyBjb2RpbmctPnByb2R1Y2VkKTsKICAgaWYgKEJVRkZFUlAgKGNv ZGluZy0+ZHN0X29iamVjdCkgJiYgcHJvZHVjZWRfY2hhcnMgPiAwKQotICAgIGluc2VydF9m cm9tX2dhcCAocHJvZHVjZWRfY2hhcnMsIHByb2R1Y2VkLCAwKTsKKyAgICBpbnNlcnRfZnJv bV9nYXAgKHByb2R1Y2VkX2NoYXJzLCBwcm9kdWNlZCwgMCwgY29kaW5nLT5kc3RfYmVmb3Jl X21hcmtlcnMpOwogICBjb2RpbmctPnByb2R1Y2VkICs9IHByb2R1Y2VkOwogICBjb2Rpbmct PnByb2R1Y2VkX2NoYXIgKz0gcHJvZHVjZWRfY2hhcnM7CiAgIHJldHVybiBjYXJyeW92ZXI7 CkBAIC03ODE0LDcgKzc4MTUsNyBAQCBlbmNvZGVfY29kaW5nIChzdHJ1Y3QgY29kaW5nX3N5 c3RlbSAqY29kaW5nKQogICB9IHdoaWxlIChjb2RpbmctPmNvbnN1bWVkX2NoYXIgPCBjb2Rp bmctPnNyY19jaGFycyk7CiAKICAgaWYgKEJVRkZFUlAgKGNvZGluZy0+ZHN0X29iamVjdCkg JiYgY29kaW5nLT5wcm9kdWNlZF9jaGFyID4gMCkKLSAgICBpbnNlcnRfZnJvbV9nYXAgKGNv ZGluZy0+cHJvZHVjZWRfY2hhciwgY29kaW5nLT5wcm9kdWNlZCwgMCk7CisgICAgaW5zZXJ0 X2Zyb21fZ2FwIChjb2RpbmctPnByb2R1Y2VkX2NoYXIsIGNvZGluZy0+cHJvZHVjZWQsIDAs IGNvZGluZy0+ZHN0X2JlZm9yZV9tYXJrZXJzKTsKIAogICBTQUZFX0ZSRUUgKCk7CiB9CkBA IC04MDA4LDcgKzgwMDksNyBAQCBkZWNvZGVfY29kaW5nX2dhcCAoc3RydWN0IGNvZGluZ19z eXN0ZW0gKmNvZGluZywgcHRyZGlmZl90IGJ5dGVzKQogCSAgICB9CiAJICBjb2RpbmctPnBy b2R1Y2VkID0gYnl0ZXM7CiAJICBjb2RpbmctPnByb2R1Y2VkX2NoYXIgPSBjaGFyczsKLQkg IGluc2VydF9mcm9tX2dhcCAoY2hhcnMsIGJ5dGVzLCAxKTsKKwkgIGluc2VydF9mcm9tX2dh cCAoY2hhcnMsIGJ5dGVzLCAxLCBjb2RpbmctPmRzdF9iZWZvcmVfbWFya2Vycyk7CiAJICBy ZXR1cm47CiAJfQogICAgIH0KQEAgLTk5ODAsNyArOTk4MSw3IEBAIGVuY29kZV9zdHJpbmdf dXRmXzggKExpc3BfT2JqZWN0IHN0cmluZywgTGlzcF9PYmplY3QgYnVmZmVyLAogICAgICAg c3RydWN0IGJ1ZmZlciAqb2xkYiA9IGN1cnJlbnRfYnVmZmVyOwogCiAgICAgICBjdXJyZW50 X2J1ZmZlciA9IFhCVUZGRVIgKGJ1ZmZlcik7Ci0gICAgICBpbnNlcnRfZnJvbV9nYXAgKG91 dGJ5dGVzLCBvdXRieXRlcywgZmFsc2UpOworICAgICAgaW5zZXJ0X2Zyb21fZ2FwIChvdXRi eXRlcywgb3V0Ynl0ZXMsIGZhbHNlLCBmYWxzZSk7CiAgICAgICBjdXJyZW50X2J1ZmZlciA9 IG9sZGI7CiAgICAgfQogICByZXR1cm4gdmFsOwpAQCAtMTAyOTAsNyArMTAyOTEsNyBAQCAj ZGVmaW5lIFVURl84X1NFUVVFTkNFX0xFTkdUSChjKQlcCiAgICAgICBzdHJ1Y3QgYnVmZmVy ICpvbGRiID0gY3VycmVudF9idWZmZXI7CiAKICAgICAgIGN1cnJlbnRfYnVmZmVyID0gWEJV RkZFUiAoYnVmZmVyKTsKLSAgICAgIGluc2VydF9mcm9tX2dhcCAob3V0Y2hhcnMsIG91dGJ5 dGVzLCBmYWxzZSk7CisgICAgICBpbnNlcnRfZnJvbV9nYXAgKG91dGNoYXJzLCBvdXRieXRl cywgZmFsc2UsIGZhbHNlKTsKICAgICAgIGN1cnJlbnRfYnVmZmVyID0gb2xkYjsKICAgICB9 CiAgIHJldHVybiB2YWw7CmRpZmYgLS1naXQgYS9zcmMvY29kaW5nLmggYi9zcmMvY29kaW5n LmgKaW5kZXggODkwNWUzNjgzOGQuLjJlMDMxZDhjYzU1IDEwMDY0NAotLS0gYS9zcmMvY29k aW5nLmgKKysrIGIvc3JjL2NvZGluZy5oCkBAIC00MjgsNiArNDI4LDkgQEAgI2RlZmluZSBD T0RJTkdfTU9ERV9TQUZFX0VOQ09ESU5HCQkweDEwCiAgIC8qIFNldCB0byB0cnVlIGlmIGNo YXJidWYgY29udGFpbnMgYW4gYW5ub3RhdGlvbi4gICovCiAgIGJvb2xfYmYgYW5ub3RhdGVk IDogMTsKIAorICAvKiBUcnVlIHRvIGluc2VydCBiZWZvcmUgbWFya2VycyBpbiB0aGUgRFNU X09CSkVDVCBidWZmZXIuICAqLworICBib29sX2JmIGRzdF9iZWZvcmVfbWFya2VycyA6IDE7 CisKICAgLyogVXNlZCBpbnRlcm5hbGx5IGluIGNvZGluZy5jLiAgU2VlIHRoZSBjb21tZW50 IG9mIGRldGVjdF9hc2NpaS4gICovCiAgIHVuc2lnbmVkIGVvbF9zZWVuIDogMzsKIApkaWZm IC0tZ2l0IGEvc3JjL2RlY29tcHJlc3MuYyBiL3NyYy9kZWNvbXByZXNzLmMKaW5kZXggZmNk YmI0MGZjOTAuLjZjMzQyZTU0MzU1IDEwMDY0NAotLS0gYS9zcmMvZGVjb21wcmVzcy5jCisr KyBiL3NyYy9kZWNvbXByZXNzLmMKQEAgLTMxMCw3ICszMTAsNyBAQCBERUZVTiAoInpsaWIt ZGVjb21wcmVzcy1yZWdpb24iLCBGemxpYl9kZWNvbXByZXNzX3JlZ2lvbiwKICAgICAgIGlu ZmxhdGVfc3RhdHVzID0gaW5mbGF0ZSAoJnN0cmVhbSwgWl9OT19GTFVTSCk7CiAgICAgICBw b3NfYnl0ZSArPSBhdmFpbF9pbiAtIHN0cmVhbS5hdmFpbF9pbjsKICAgICAgIGRlY29tcHJl c3NlZCA9IGF2YWlsX291dCAtIHN0cmVhbS5hdmFpbF9vdXQ7Ci0gICAgICBpbnNlcnRfZnJv bV9nYXAgKGRlY29tcHJlc3NlZCwgZGVjb21wcmVzc2VkLCAwKTsKKyAgICAgIGluc2VydF9m cm9tX2dhcCAoZGVjb21wcmVzc2VkLCBkZWNvbXByZXNzZWQsIDAsIGZhbHNlKTsKICAgICAg IHVud2luZF9kYXRhLm5ieXRlcyArPSBkZWNvbXByZXNzZWQ7CiAgICAgICBtYXliZV9xdWl0 ICgpOwogICAgIH0KZGlmZiAtLWdpdCBhL3NyYy9pbnNkZWwuYyBiL3NyYy9pbnNkZWwuYwpp bmRleCBmYmY3MWUxZTU5NS4uOGY4ZTdiN2Q3MWQgMTAwNjQ0Ci0tLSBhL3NyYy9pbnNkZWwu YworKysgYi9zcmMvaW5zZGVsLmMKQEAgLTExMjksMTAgKzExMjksMTIgQEAgaW5zZXJ0X2Zy b21fZ2FwXzEgKHB0cmRpZmZfdCBuY2hhcnMsIHB0cmRpZmZfdCBuYnl0ZXMsIGJvb2wgdGV4 dF9hdF9nYXBfdGFpbCkKIAogLyogSW5zZXJ0IGEgc2VxdWVuY2Ugb2YgTkNIQVJTIGNoYXJz IHdoaWNoIG9jY3VweSBOQllURVMgYnl0ZXMKICAgIHN0YXJ0aW5nIGF0IEdBUF9FTkRfQURE UiAtIE5CWVRFUyAoaWYgdGV4dF9hdF9nYXBfdGFpbCkgYW5kIGF0Ci0gICBHUFRfQUREUiAo aWYgbm90IHRleHRfYXRfZ2FwX3RhaWwpLiAgKi8KKyAgIEdQVF9BRERSIChpZiBub3QgdGV4 dF9hdF9nYXBfdGFpbCkuCisKKyAgSWYgQkVGT1JFX01BUktFUlMgaXMgdHJ1ZSwgaW5zZXJ0 IGJlZm9yZSBtYXJrZXJzLiAqLwogCiB2b2lkCi1pbnNlcnRfZnJvbV9nYXAgKHB0cmRpZmZf dCBuY2hhcnMsIHB0cmRpZmZfdCBuYnl0ZXMsIGJvb2wgdGV4dF9hdF9nYXBfdGFpbCkKK2lu c2VydF9mcm9tX2dhcCAocHRyZGlmZl90IG5jaGFycywgcHRyZGlmZl90IG5ieXRlcywgYm9v bCB0ZXh0X2F0X2dhcF90YWlsLCBib29sIGJlZm9yZV9tYXJrZXJzKQogewogICBwdHJkaWZm X3QgaW5zX2NoYXJwb3MgPSBHUFQsIGluc19ieXRlcG9zID0gR1BUX0JZVEU7CiAKQEAgLTEx NTEsNyArMTE1Myw3IEBAIGluc2VydF9mcm9tX2dhcCAocHRyZGlmZl90IG5jaGFycywgcHRy ZGlmZl90IG5ieXRlcywgYm9vbCB0ZXh0X2F0X2dhcF90YWlsKQogICBpbnNlcnRfZnJvbV9n YXBfMSAobmNoYXJzLCBuYnl0ZXMsIHRleHRfYXRfZ2FwX3RhaWwpOwogCiAgIGFkanVzdF9t YXJrZXJzX2Zvcl9pbnNlcnQgKGluc19jaGFycG9zLCBpbnNfYnl0ZXBvcywKLQkJCSAgICAg aW5zX2NoYXJwb3MgKyBuY2hhcnMsIGluc19ieXRlcG9zICsgbmJ5dGVzLCBmYWxzZSk7CisJ CQkgICAgIGluc19jaGFycG9zICsgbmNoYXJzLCBpbnNfYnl0ZXBvcyArIG5ieXRlcywgYmVm b3JlX21hcmtlcnMpOwogCiAgIGlmIChidWZmZXJfaW50ZXJ2YWxzIChjdXJyZW50X2J1ZmZl cikpCiAgICAgewpkaWZmIC0tZ2l0IGEvc3JjL2xpc3AuaCBiL3NyYy9saXNwLmgKaW5kZXgg MjFkYWRhNTkxMzIuLjJjM2M0ZTBiYTg3IDEwMDY0NAotLS0gYS9zcmMvbGlzcC5oCisrKyBi L3NyYy9saXNwLmgKQEAgLTQzNzIsNyArNDM3Miw4IEBAIHZlcmlmeSAoRkxUX1JBRElYID09 IDIgfHwgRkxUX1JBRElYID09IDE2KTsKIGV4dGVybiB2b2lkIGluc2VydF8xX2JvdGggKGNv bnN0IGNoYXIgKiwgcHRyZGlmZl90LCBwdHJkaWZmX3QsCiAJCQkgICBib29sLCBib29sLCBi b29sKTsKIGV4dGVybiB2b2lkIGluc2VydF9mcm9tX2dhcF8xIChwdHJkaWZmX3QsIHB0cmRp ZmZfdCwgYm9vbCB0ZXh0X2F0X2dhcF90YWlsKTsKLWV4dGVybiB2b2lkIGluc2VydF9mcm9t X2dhcCAocHRyZGlmZl90LCBwdHJkaWZmX3QsIGJvb2wgdGV4dF9hdF9nYXBfdGFpbCk7Citl eHRlcm4gdm9pZCBpbnNlcnRfZnJvbV9nYXAgKHB0cmRpZmZfdCwgcHRyZGlmZl90LCBib29s IHRleHRfYXRfZ2FwX3RhaWwsCisJCQkgICAgIGJvb2wgYmVmb3JlX21hcmtlcnMpOwogZXh0 ZXJuIHZvaWQgaW5zZXJ0X2Zyb21fc3RyaW5nIChMaXNwX09iamVjdCwgcHRyZGlmZl90LCBw dHJkaWZmX3QsCiAJCQkJcHRyZGlmZl90LCBwdHJkaWZmX3QsIGJvb2wpOwogZXh0ZXJuIHZv aWQgaW5zZXJ0X2Zyb21fYnVmZmVyIChzdHJ1Y3QgYnVmZmVyICosIHB0cmRpZmZfdCwgcHRy ZGlmZl90LCBib29sKTsKZGlmZiAtLWdpdCBhL3NyYy9wcm9jZXNzLmMgYi9zcmMvcHJvY2Vz cy5jCmluZGV4IGViNTI2MzExYzUzLi43MDAwYjUxNzc1YyAxMDA2NDQKLS0tIGEvc3JjL3By b2Nlc3MuYworKysgYi9zcmMvcHJvY2Vzcy5jCkBAIC02NDE1LDYgKzY0MTUsNyBAQCByZWFk X2FuZF9pbnNlcnRfcHJvY2Vzc19vdXRwdXQgKHN0cnVjdCBMaXNwX1Byb2Nlc3MgKnAsIGNo YXIgKmJ1ZiwKICAgICAgIHNwZWNwZGxfcmVmIGNvdW50MSA9IFNQRUNQRExfSU5ERVggKCk7 CiAKICAgICAgIFhTRVRCVUZGRVIgKGN1cmJ1ZiwgY3VycmVudF9idWZmZXIpOworICAgICAg cHJvY2Vzc19jb2RpbmctPmRzdF9iZWZvcmVfbWFya2VycyA9IHRydWU7CiAgICAgICAvKiBX ZSBjYW5ub3QgYWxsb3cgYWZ0ZXItY2hhbmdlLWZ1bmN0aW9ucyBiZSBydW4KIAkgZHVyaW5n IGRlY29kaW5nLCBiZWNhdXNlIHRoYXQgbWlnaHQgbW9kaWZ5IHRoZQogCSBidWZmZXIsIHdo aWxlIHdlIHJlbHkgb24gcHJvY2Vzc19jb2RpbmcucHJvZHVjZWQgdG8KQEAgLTY0MjMsOSAr NjQyNCw2IEBAIHJlYWRfYW5kX2luc2VydF9wcm9jZXNzX291dHB1dCAoc3RydWN0IExpc3Bf UHJvY2VzcyAqcCwgY2hhciAqYnVmLAogICAgICAgc3BlY2JpbmQgKFFpbmhpYml0X21vZGlm aWNhdGlvbl9ob29rcywgUXQpOwogICAgICAgZGVjb2RlX2NvZGluZ19jX3N0cmluZyAocHJv Y2Vzc19jb2RpbmcsCiAJCQkgICAgICAodW5zaWduZWQgY2hhciAqKSBidWYsIG5yZWFkLCBj dXJidWYpOwotICAgICAgYWRqdXN0X21hcmtlcnNfZm9yX2luc2VydCAoUFQsIFBUX0JZVEUs Ci0JCQkJIFBUICsgcHJvY2Vzc19jb2RpbmctPnByb2R1Y2VkX2NoYXIsCi0JCQkJIFBUX0JZ VEUgKyBwcm9jZXNzX2NvZGluZy0+cHJvZHVjZWQsIHRydWUpOwogICAgICAgdW5iaW5kX3Rv IChjb3VudDEsIFFuaWwpOwogCiAgICAgICByZWFkX3Byb2Nlc3Nfb3V0cHV0X3NldF9sYXN0 X2NvZGluZ19zeXN0ZW0gKHAsIHByb2Nlc3NfY29kaW5nKTsK --------------j06g2iyqR4HwhjqSSwTQAkIw--