From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Pip Cet Newsgroups: gmane.emacs.devel Subject: Re: [MPS-test] scratch/igc branch (commit: 42731228d24) crashed Date: Mon, 05 Aug 2024 16:40:50 +0000 Message-ID: <9d5pSofW1FhcAKO7fyf_c8hAwDE8aiuiDGWFglQZI-1FwaDY3KBS5zPkKt0nKUkzs0McRm9kHq47qZjzTz0rgfde5QfLH0v0KdgUxVXI6GA=@protonmail.com> References: <87plqnuekc.fsf@protonmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_gmIQduqeO9zGT7Oe6oFKCtdmbJmaFyStbDrQbLCvHw" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="25111"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eval Exec , emacs-devel@gnu.org To: Pip Cet Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Aug 05 19:37:50 2024 Return-path: Envelope-to: ged-emacs-devel@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 1sb1eX-0006P0-SV for ged-emacs-devel@m.gmane-mx.org; Mon, 05 Aug 2024 19:37:49 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sb1do-00052f-54; Mon, 05 Aug 2024 13:37:04 -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 1sb0ln-0001L2-Dv for emacs-devel@gnu.org; Mon, 05 Aug 2024 12:41:15 -0400 Original-Received: from mail-4322.protonmail.ch ([185.70.43.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sb0li-0003MP-Ob for emacs-devel@gnu.org; Mon, 05 Aug 2024 12:41:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1722876067; x=1723135267; bh=p9CCJ73T2bSlymwJDPRjJHHW5yxdgTItBMPIGlQvtFw=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=sX3UNYKMr4qzBwlU5zOheMlHwQOlzvKzehcXhBsyO3bPgevcOu9Lw+yXvxCV1w/2q KzoYUyYEN6iWO6LX8cwPDjnTQJg9UhRjW0E5CzUqF0p2O4VMaMhTgjHfkMkDizp5ry LyBxP3t62KUZuNFuwrE6mULxjxME++569cjqr2Gsc6IelaBpjqAVjWUEfZ7EkYaOgi 8puaohNC9Kw8vkmkr2kJj9OJUVby1dJ36xIg9BEp33WEthoHz2z9Q2bpQWHbqnwLXZ xWtRO8z0wO78gpZI1Y8hnnKUwEcjrZrLN/r/cUMNRqOX+wVrkeizz8Wyd6UAME8zTN UiOwoxzG17w7w== In-Reply-To: <87plqnuekc.fsf@protonmail.com> Feedback-ID: 112775352:user:proton X-Pm-Message-ID: 80b717d69f2bf2feccb26222e148e010e46bacdf Received-SPF: pass client-ip=185.70.43.22; envelope-from=pipcet@protonmail.com; helo=mail-4322.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Mon, 05 Aug 2024 13:37:00 -0400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:322398 Archived-At: This is a multi-part message in MIME format. --b1_gmIQduqeO9zGT7Oe6oFKCtdmbJmaFyStbDrQbLCvHw Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Monday, August 5th, 2024 at 16:20, Pip Cet wrote= : > "Eval Exec" execvy@gmail.com writes: >=20 > > I wanted to help test the scratch/igc branch, so I compiled it from > > commit 42731228d24. >=20 > Thank you for doing that! >=20 > > Then I build it by > > ```bash > > make extraclean > > ./autogen.sh \ > > && ./configure \ > > --prefix=3D$(realpath ../emacs-build)\ > > --with-mps \ > > --with-imagemagick \ > > --with-modules --with-x-toolkit=3Dlucid --without-compress-install \ > > --without-toolkit-scroll-bars --with-native-compilation --with-mailutil= s\ > > --with-tree-sitter --with-xinput2 \ > > --with-dbus --with-native-compilation=3Daot \ > > --with-file-notification=3Dinotify\ > > && make -j20 install >=20 >=20 > Like Eli, I'm suspecting the Lucid widget code... >=20 > > It works perfectly for the first hour, but then it crashes, and I > > don't know how to reproduce the issue. > >=20 > > I think the crash is caused by "window size adjustments" > > ``` > > (gdb) bt > > #0 0x00007f47afea2efc in __pthread_kill_implementation () from > > /nix/store/dbcw19dshdwnxdv5q2g6wldj6syyvq7l-glibc-2.39-52/lib/libc.so.6 > > #1 0x00007f47afe52e86 in raise () from > > /nix/store/dbcw19dshdwnxdv5q2g6wldj6syyvq7l-glibc-2.39-52/lib/libc.so.6 > > #2 0x00000000004243a4 in terminate_due_to_signal (sig=3Dsig@entry=3D8, > > backtrace_limit=3Dbacktrace_limit@entry=3D40) at emacs.c:470 > > #3 0x00000000004248fc in handle_fatal_signal (sig=3Dsig@entry=3D8) at s= ysdep.c:1800 > > #4 0x000000000056f568 in deliver_thread_signal (sig=3D8, > > handler=3D0x4248f1 ) at sysdep.c:1792 > > #5 0x000000000056f669 in deliver_fatal_thread_signal (sig=3D > out>) at sysdep.c:1812 > > #6 > > #7 0x000000000069e35e in pixel_to_char_size > > (pixel_width=3Dpixel_width@entry=3D482, > > pixel_height=3Dpixel_height@entry=3D76, > > char_width=3Dchar_width@entry=3D0x7ffced20da38, > > char_height=3Dchar_height@entry=3D0x7ffced20da3c, > > ew=3D) at widget.c:172 >=20 >=20 > That code reads: >=20 > static void > pixel_to_char_size (EmacsFrame ew, Dimension pixel_width, > Dimension pixel_height, int *char_width, int *char_height) > { > struct frame *f =3D ew->emacs_frame.frame; >=20 >=20 > *char_width =3D FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, (int) pixel_width); > *char_height =3D FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, (int) pixel_height)= ; > } >=20 > Which gets a frame pointer from a structure (ew) that MPS doesn't know > about; but frames can move, so that explains the bug, because MPS > doesn't know to update the pointer in the EmacsFrame structure. >=20 > Unfortunately, the structure is allocated by XtCreateWidget, which calls > malloc(), IIUC. So it's not immediately obvious (to me) how to fix it. > My best idea so far is to create an ambiguous root covering the frame > pointer and store that in the structure instead. So I've done that, can you try the attached patch? This is a first stab (th= us the ambiguous alloc), but it should prevent the crash we've seen. TODO list for this: - use precise alloc - check framep, not *framep, in EmacsFrameInitialize Pip --b1_gmIQduqeO9zGT7Oe6oFKCtdmbJmaFyStbDrQbLCvHw Content-Type: text/x-patch; name=0001-mps-lucid.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-mps-lucid.patch ZGlmZiAtLWdpdCBhL3NyYy93aWRnZXQuYyBiL3NyYy93aWRnZXQuYwppbmRleCBkMjI3MzJmZjkz YS4uY2MxYWVlYjI1YTkgMTAwNjQ0Ci0tLSBhL3NyYy93aWRnZXQuYworKysgYi9zcmMvd2lkZ2V0 LmMKQEAgLTMyLDYgKzMyLDcgQEAKICNpbmNsdWRlICJzeXNzdGRpby5oIgogI2luY2x1ZGUgInh0 ZXJtLmgiCiAjaW5jbHVkZSAiZnJhbWUuaCIKKyNpbmNsdWRlICJpZ2MuaCIKIAogI2luY2x1ZGUg PFgxMS9TdHJpbmdEZWZzLmg+CiAjaW5jbHVkZSA8WDExL0ludHJpbnNpY1AuaD4KQEAgLTYxLDcg KzYyLDcgQEAgI2RlZmluZSBvZmZzZXQoZmllbGQpIG9mZnNldG9mIChFbWFjc0ZyYW1lUmVjLCBl bWFjc19mcmFtZS5maWVsZCkKIAogICB7KGNoYXIgKikgWHROZW1hY3NGcmFtZSwgKGNoYXIgKikg WHRDRW1hY3NGcmFtZSwKICAgICAgWHRSUG9pbnRlciwgc2l6ZW9mIChYdFBvaW50ZXIpLAotICAg ICBvZmZzZXQgKGZyYW1lKSwgWHRSSW1tZWRpYXRlLCAwfSwKKyAgICAgb2Zmc2V0IChmcmFtZXAp LCBYdFJJbW1lZGlhdGUsIDB9LAogCiAgIHsoY2hhciAqKSBYdE5taW5pYnVmZmVyLCAoY2hhciAq KSBYdENNaW5pYnVmZmVyLCBYdFJJbnQsIHNpemVvZiAoaW50KSwKICAgICAgb2Zmc2V0IChtaW5p YnVmZmVyKSwgWHRSSW1tZWRpYXRlLCAoWHRQb2ludGVyKTB9LApAQCAtMTU3LDcgKzE1OCw3IEBA IGVtYWNzRnJhbWVDbGFzcyAodm9pZCkKIHN0YXRpYyB2b2lkCiBnZXRfZGVmYXVsdF9jaGFyX3Bp eGVsX3NpemUgKEVtYWNzRnJhbWUgZXcsIGludCAqcGl4ZWxfd2lkdGgsIGludCAqcGl4ZWxfaGVp Z2h0KQogewotICBzdHJ1Y3QgZnJhbWUgKmYgPSBldy0+ZW1hY3NfZnJhbWUuZnJhbWU7CisgIHN0 cnVjdCBmcmFtZSAqZiA9ICpldy0+ZW1hY3NfZnJhbWUuZnJhbWVwOwogCiAgICpwaXhlbF93aWR0 aCA9IEZSQU1FX0NPTFVNTl9XSURUSCAoZik7CiAgICpwaXhlbF9oZWlnaHQgPSBGUkFNRV9MSU5F X0hFSUdIVCAoZik7CkBAIC0xNjcsNyArMTY4LDcgQEAgZ2V0X2RlZmF1bHRfY2hhcl9waXhlbF9z aXplIChFbWFjc0ZyYW1lIGV3LCBpbnQgKnBpeGVsX3dpZHRoLCBpbnQgKnBpeGVsX2hlaWdodCkK IHBpeGVsX3RvX2NoYXJfc2l6ZSAoRW1hY3NGcmFtZSBldywgRGltZW5zaW9uIHBpeGVsX3dpZHRo LAogCQkgICAgRGltZW5zaW9uIHBpeGVsX2hlaWdodCwgaW50ICpjaGFyX3dpZHRoLCBpbnQgKmNo YXJfaGVpZ2h0KQogewotICBzdHJ1Y3QgZnJhbWUgKmYgPSBldy0+ZW1hY3NfZnJhbWUuZnJhbWU7 CisgIHN0cnVjdCBmcmFtZSAqZiA9ICpldy0+ZW1hY3NfZnJhbWUuZnJhbWVwOwogCiAgICpjaGFy X3dpZHRoID0gRlJBTUVfUElYRUxfV0lEVEhfVE9fVEVYVF9DT0xTIChmLCAoaW50KSBwaXhlbF93 aWR0aCk7CiAgICpjaGFyX2hlaWdodCA9IEZSQU1FX1BJWEVMX0hFSUdIVF9UT19URVhUX0xJTkVT IChmLCAoaW50KSBwaXhlbF9oZWlnaHQpOwpAQCAtMTc3LDcgKzE3OCw3IEBAIHBpeGVsX3RvX2No YXJfc2l6ZSAoRW1hY3NGcmFtZSBldywgRGltZW5zaW9uIHBpeGVsX3dpZHRoLAogY2hhcl90b19w aXhlbF9zaXplIChFbWFjc0ZyYW1lIGV3LCBpbnQgY2hhcl93aWR0aCwgaW50IGNoYXJfaGVpZ2h0 LAogCQkgICAgRGltZW5zaW9uICpwaXhlbF93aWR0aCwgRGltZW5zaW9uICpwaXhlbF9oZWlnaHQp CiB7Ci0gIHN0cnVjdCBmcmFtZSAqZiA9IGV3LT5lbWFjc19mcmFtZS5mcmFtZTsKKyAgc3RydWN0 IGZyYW1lICpmID0gKmV3LT5lbWFjc19mcmFtZS5mcmFtZXA7CiAKICAgKnBpeGVsX3dpZHRoID0g RlJBTUVfVEVYVF9DT0xTX1RPX1BJWEVMX1dJRFRIIChmLCBjaGFyX3dpZHRoKTsKICAgKnBpeGVs X2hlaWdodCA9IEZSQU1FX1RFWFRfTElORVNfVE9fUElYRUxfSEVJR0hUIChmLCBjaGFyX2hlaWdo dCk7CkBAIC0yNTksNyArMjYwLDcgQEAgc2V0X2ZyYW1lX3NpemUgKEVtYWNzRnJhbWUgZXcpCiAK ICAgICovCiAKLSAgc3RydWN0IGZyYW1lICpmID0gZXctPmVtYWNzX2ZyYW1lLmZyYW1lOworICBz dHJ1Y3QgZnJhbWUgKmYgPSAqZXctPmVtYWNzX2ZyYW1lLmZyYW1lcDsKIAogICBldy0+Y29yZS53 aWR0aCA9IEZSQU1FX1BJWEVMX1dJRFRIIChmKTsKICAgZXctPmNvcmUuaGVpZ2h0ID0gRlJBTUVf UElYRUxfSEVJR0hUIChmKTsKQEAgLTMyNiw3ICszMjcsNyBAQCB3aWRnZXRfdXBkYXRlX3dtX3Np emVfaGludHMgKFdpZGdldCB3aWRnZXQsIFdpZGdldCBmcmFtZSkKIHN0YXRpYyB2b2lkCiB1cGRh dGVfdmFyaW91c19mcmFtZV9zbG90cyAoRW1hY3NGcmFtZSBldykKIHsKLSAgc3RydWN0IGZyYW1l ICpmID0gZXctPmVtYWNzX2ZyYW1lLmZyYW1lOworICBzdHJ1Y3QgZnJhbWUgKmYgPSAqZXctPmVt YWNzX2ZyYW1lLmZyYW1lcDsKIAogICBmLT5pbnRlcm5hbF9ib3JkZXJfd2lkdGggPSBldy0+ZW1h Y3NfZnJhbWUuaW50ZXJuYWxfYm9yZGVyX3dpZHRoOwogfQpAQCAtMzM0LDcgKzMzNSw3IEBAIHVw ZGF0ZV92YXJpb3VzX2ZyYW1lX3Nsb3RzIChFbWFjc0ZyYW1lIGV3KQogc3RhdGljIHZvaWQKIHVw ZGF0ZV9mcm9tX3ZhcmlvdXNfZnJhbWVfc2xvdHMgKEVtYWNzRnJhbWUgZXcpCiB7Ci0gIHN0cnVj dCBmcmFtZSAqZiA9IGV3LT5lbWFjc19mcmFtZS5mcmFtZTsKKyAgc3RydWN0IGZyYW1lICpmID0g KmV3LT5lbWFjc19mcmFtZS5mcmFtZXA7CiAgIHN0cnVjdCB4X291dHB1dCAqeCA9IGYtPm91dHB1 dF9kYXRhLng7CiAKICAgZXctPmNvcmUuaGVpZ2h0ID0gRlJBTUVfUElYRUxfSEVJR0hUIChmKSAt IHgtPm1lbnViYXJfaGVpZ2h0OwpAQCAtMzU5LDcgKzM2MCw3IEBAIEVtYWNzRnJhbWVJbml0aWFs aXplIChXaWRnZXQgcmVxdWVzdCwgV2lkZ2V0IG5ldywKIHsKICAgRW1hY3NGcmFtZSBldyA9IChF bWFjc0ZyYW1lKSBuZXc7CiAKLSAgaWYgKCFldy0+ZW1hY3NfZnJhbWUuZnJhbWUpCisgIGlmICgh KmV3LT5lbWFjc19mcmFtZS5mcmFtZXApCiAgICAgewogICAgICAgZnB1dHMgKCJjYW4ndCBjcmVh dGUgYW4gZW1hY3MgZnJhbWUgd2lkZ2V0IHdpdGhvdXQgYSBmcmFtZVxuIiwgc3RkZXJyKTsKICAg ICAgIGV4aXQgKDEpOwpAQCAtMzg0LDcgKzM4NSw3IEBAIEVtYWNzRnJhbWVSZWFsaXplIChXaWRn ZXQgd2lkZ2V0LCBYdFZhbHVlTWFzayAqbWFzaywKIAkJICAgWFNldFdpbmRvd0F0dHJpYnV0ZXMg KmF0dHJzKQogewogICBFbWFjc0ZyYW1lIGV3ID0gKEVtYWNzRnJhbWUpIHdpZGdldDsKLSAgc3Ry dWN0IGZyYW1lICpmID0gZXctPmVtYWNzX2ZyYW1lLmZyYW1lOworICBzdHJ1Y3QgZnJhbWUgKmYg PSAqZXctPmVtYWNzX2ZyYW1lLmZyYW1lcDsKIAogICAvKiBUaGlzIHVzZWQgdG8gY29udGFpbiBT dWJzdHJ1Y3R1cmVSZWRpcmVjdE1hc2ssIGJ1dCB0aGlzIHR1cm5zIG91dAogICAgICB0byBiZSBh IHByb2JsZW0gd2l0aCBYSU0gb24gU29sYXJpcywgYW5kIGV2ZW50cyBmcm9tIHRoYXQgbWFzawpA QCAtNDEwLDE0ICs0MTEsMjEgQEAgRW1hY3NGcmFtZVJlYWxpemUgKFdpZGdldCB3aWRnZXQsIFh0 VmFsdWVNYXNrICptYXNrLAogc3RhdGljIHZvaWQKIEVtYWNzRnJhbWVEZXN0cm95IChXaWRnZXQg d2lkZ2V0KQogewotICAvKiBBbGwgR0NzIGFyZSBub3cgZnJlZWQgaW4geF9mcmVlX2ZyYW1lX3Jl c291cmNlcy4gICovCisgIEVtYWNzRnJhbWUgZXcgPSAoRW1hY3NGcmFtZSkgd2lkZ2V0OworICBz dHJ1Y3QgZnJhbWUgKipmcCA9IGV3LT5lbWFjc19mcmFtZS5mcmFtZXA7CisKKyNpZmRlZiBIQVZF X01QUworICBpZ2NfeGZyZWUgKGZwKTsKKyNlbHNlCisgIHhmcmVlIChmcCk7CisjZW5kaWYKIH0K IAogc3RhdGljIHZvaWQKIEVtYWNzRnJhbWVSZXNpemUgKFdpZGdldCB3aWRnZXQpCiB7CiAgIEVt YWNzRnJhbWUgZXcgPSAoRW1hY3NGcmFtZSkgd2lkZ2V0OwotICBzdHJ1Y3QgZnJhbWUgKmYgPSBl dy0+ZW1hY3NfZnJhbWUuZnJhbWU7CisgIHN0cnVjdCBmcmFtZSAqZiA9ICpldy0+ZW1hY3NfZnJh bWUuZnJhbWVwOwogCiAgIGlmIChDT05TUCAoZnJhbWVfc2l6ZV9oaXN0b3J5KSkKICAgICBmcmFt ZV9zaXplX2hpc3RvcnlfZXh0cmEKQEAgLTQ3MCw3ICs0NzgsNyBAQCBFbWFjc0ZyYW1lUXVlcnlH ZW9tZXRyeSAoV2lkZ2V0IHdpZGdldCwgWHRXaWRnZXRHZW9tZXRyeSAqcmVxdWVzdCwKIEVtYWNz RnJhbWVTZXRDaGFyU2l6ZSAoV2lkZ2V0IHdpZGdldCwgaW50IGNvbHVtbnMsIGludCByb3dzKQog ewogICBFbWFjc0ZyYW1lIGV3ID0gKEVtYWNzRnJhbWUpIHdpZGdldDsKLSAgc3RydWN0IGZyYW1l ICpmID0gZXctPmVtYWNzX2ZyYW1lLmZyYW1lOworICBzdHJ1Y3QgZnJhbWUgKmYgPSAqZXctPmVt YWNzX2ZyYW1lLmZyYW1lcDsKIAogICBpZiAoQ09OU1AgKGZyYW1lX3NpemVfaGlzdG9yeSkpCiAg ICAgZnJhbWVfc2l6ZV9oaXN0b3J5X2V4dHJhCkBAIC00ODksNyArNDk3LDcgQEAgRW1hY3NGcmFt ZVNldENoYXJTaXplIChXaWRnZXQgd2lkZ2V0LCBpbnQgY29sdW1ucywgaW50IHJvd3MpCiBFbWFj c0ZyYW1lRXhwb3NlIChXaWRnZXQgd2lkZ2V0LCBYRXZlbnQgKmV2ZW50LCBSZWdpb24gcmVnaW9u KQogewogICBFbWFjc0ZyYW1lIGV3ID0gKEVtYWNzRnJhbWUpIHdpZGdldDsKLSAgc3RydWN0IGZy YW1lICpmID0gZXctPmVtYWNzX2ZyYW1lLmZyYW1lOworICBzdHJ1Y3QgZnJhbWUgKmYgPSAqZXct PmVtYWNzX2ZyYW1lLmZyYW1lcDsKIAogICBleHBvc2VfZnJhbWUgKGYsIGV2ZW50LT54ZXhwb3Nl LngsIGV2ZW50LT54ZXhwb3NlLnksCiAJCWV2ZW50LT54ZXhwb3NlLndpZHRoLCBldmVudC0+eGV4 cG9zZS5oZWlnaHQpOwpAQCAtNTAxLDcgKzUwOSw3IEBAIEVtYWNzRnJhbWVFeHBvc2UgKFdpZGdl dCB3aWRnZXQsIFhFdmVudCAqZXZlbnQsIFJlZ2lvbiByZWdpb24pCiB3aWRnZXRfc3RvcmVfaW50 ZXJuYWxfYm9yZGVyIChXaWRnZXQgd2lkZ2V0KQogewogICBFbWFjc0ZyYW1lIGV3ID0gKEVtYWNz RnJhbWUpIHdpZGdldDsKLSAgc3RydWN0IGZyYW1lICpmID0gZXctPmVtYWNzX2ZyYW1lLmZyYW1l OworICBzdHJ1Y3QgZnJhbWUgKmYgPSAqZXctPmVtYWNzX2ZyYW1lLmZyYW1lcDsKIAogICBldy0+ ZW1hY3NfZnJhbWUuaW50ZXJuYWxfYm9yZGVyX3dpZHRoID0gZi0+aW50ZXJuYWxfYm9yZGVyX3dp ZHRoOwogfQpkaWZmIC0tZ2l0IGEvc3JjL3dpZGdldHBydi5oIGIvc3JjL3dpZGdldHBydi5oCmlu ZGV4IGI5Y2Q3MmE0YmMyLi5lNjNiYmRhMWZlMyAxMDA2NDQKLS0tIGEvc3JjL3dpZGdldHBydi5o CisrKyBiL3NyYy93aWRnZXRwcnYuaApAQCAtMjUsNyArMjUsNyBAQCAjZGVmaW5lIF9FbWFjc0Zy YW1lUF9oCiAjaW5jbHVkZSA8WDExL0NvcmVQLmg+CiAKIHR5cGVkZWYgc3RydWN0IHsKLSAgc3Ry dWN0IGZyYW1lICpmcmFtZTsJCS8qIHRoZSAqZW1hY3MqIGZyYW1lIG9iamVjdCAqLworICBzdHJ1 Y3QgZnJhbWUgKipmcmFtZXA7CQkvKiB0aGUgKmVtYWNzKiBmcmFtZSBvYmplY3QgKi8KIAogICAv KiBSZXNvdXJjZXMgdGhhdCBjYW4ndCBiZSBkb25lIGZyb20gbGlzcC4KICAgICovCmRpZmYgLS1n aXQgYS9zcmMveGZucy5jIGIvc3JjL3hmbnMuYwppbmRleCAzZjBkOGYzZmNkMC4uNTNhZDQ2MDkw M2IgMTAwNjQ0Ci0tLSBhL3NyYy94Zm5zLmMKKysrIGIvc3JjL3hmbnMuYwpAQCAtMjQsNiArMjQs NyBAQCBDb3B5cmlnaHQgKEMpIDE5ODksIDE5OTItMjAyNCBGcmVlIFNvZnR3YXJlIEZvdW5kYXRp b24sIEluYy4KICNpbmNsdWRlIDx1bmlzdGQuaD4KIAogI2luY2x1ZGUgImxpc3AuaCIKKyNpbmNs dWRlICJpZ2MuaCIKICNpbmNsdWRlICJjaGFyYWN0ZXIuaCIKICNpbmNsdWRlICJ4dGVybS5oIgog I2luY2x1ZGUgImZyYW1lLmgiCkBAIC00MTk1LDEyICs0MTk2LDIwIEBAIHhfd2luZG93IChzdHJ1 Y3QgZnJhbWUgKmYsIGxvbmcgd2luZG93X3Byb21wdGluZykKICAgLyogbWFwcGVkV2hlbk1hbmFn ZWQgdG8gZmFsc2UgdGVsbHMgdG8gdGhlIHBhbmVkIHdpbmRvdyB0byBub3QgbWFwL3VubWFwCiAg ICAgIHRoZSBlbWFjcyBzY3JlZW4gd2hlbiBjaGFuZ2luZyBtZW51YmFyLiAgVGhpcyByZWR1Y2Vz IGZsaWNrZXJpbmcuICAqLwogCisgIHN0cnVjdCBmcmFtZSAqKmZyYW1lcDsKKyNpZmRlZiBIQVZF X01QUworICBmcmFtZXAgPSBpZ2NfeHphbGxvY19hbWJpZyAoc2l6ZW9mICpmcmFtZXApOworI2Vs c2UKKyAgZnJhbWVwID0geG1hbGxvYyAoc2l6ZW9mICpmcmFtZXApOworI2VuZGlmCisgICpmcmFt ZXAgPSBmOworCiAgIGFjID0gMDsKICAgWHRTZXRBcmcgKGFsW2FjXSwgWHRObWFwcGVkV2hlbk1h bmFnZWQsIDApOyBhYysrOwogICBYdFNldEFyZyAoYWxbYWNdLCAoY2hhciAqKSBYdE5zaG93R3Jp cCwgMCk7IGFjKys7CiAgIFh0U2V0QXJnIChhbFthY10sIChjaGFyICopIFh0TmFsbG93UmVzaXpl LCAxKTsgYWMrKzsKICAgWHRTZXRBcmcgKGFsW2FjXSwgKGNoYXIgKikgWHROcmVzaXplVG9QcmVm ZXJyZWQsIDEpOyBhYysrOwotICBYdFNldEFyZyAoYWxbYWNdLCAoY2hhciAqKSBYdE5lbWFjc0Zy YW1lLCBmKTsgYWMrKzsKKyAgWHRTZXRBcmcgKGFsW2FjXSwgKGNoYXIgKikgWHROZW1hY3NGcmFt ZSwgZnJhbWVwKTsgYWMrKzsKICAgWHRTZXRBcmcgKGFsW2FjXSwgWHROdmlzdWFsLCBGUkFNRV9Y X1ZJU1VBTCAoZikpOyBhYysrOwogICBYdFNldEFyZyAoYWxbYWNdLCBYdE5kZXB0aCwgRlJBTUVf RElTUExBWV9JTkZPIChmKS0+bl9wbGFuZXMpOyBhYysrOwogICBYdFNldEFyZyAoYWxbYWNdLCBY dE5jb2xvcm1hcCwgRlJBTUVfWF9DT0xPUk1BUCAoZikpOyBhYysrOwo= --b1_gmIQduqeO9zGT7Oe6oFKCtdmbJmaFyStbDrQbLCvHw--