From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26075 invoked by alias); 21 Jul 2010 09:53:21 -0000 Received: (qmail 26064 invoked by uid 22791); 21 Jul 2010 09:53:21 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-ew0-f41.google.com (HELO mail-ew0-f41.google.com) (209.85.215.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 21 Jul 2010 09:53:16 +0000 Received: by ewy28 with SMTP id 28so2353827ewy.0 for ; Wed, 21 Jul 2010 02:53:13 -0700 (PDT) MIME-Version: 1.0 Received: by 10.213.4.203 with SMTP id 11mr2575661ebs.5.1279705993624; Wed, 21 Jul 2010 02:53:13 -0700 (PDT) Received: by 10.213.20.148 with HTTP; Wed, 21 Jul 2010 02:53:13 -0700 (PDT) Date: Wed, 21 Jul 2010 09:53:00 -0000 Message-ID: Subject: [PATCH] [7.2] Merge recent win64 breakage fixes from HEAD to 7.2 branch From: Ozkan Sezer To: gdb-patches@sourceware.org Cc: Tom Tromey , Pedro Alves , Mike Frysinger Content-Type: multipart/mixed; boundary=0015174c0d2e2ac4a5048be2c562 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-07/txt/msg00328.txt.bz2 --0015174c0d2e2ac4a5048be2c562 Content-Type: text/plain; charset=ISO-8859-1 Content-length: 933 Hi! If there are no objections, I want to apply the attached patch to the 7.2 branch soon. - Merge recent win64 breakage fixes from HEAD to 7.2 branch: gdb/ * target.c (debug_to_insert_breakpoint): Instead of casting to unsigned long and %ld, use core_addr_to_string() and %s to print CORE_ADDR vars and host_address_to_string() and %s for pointers. (debug_to_remove_breakpoint): Likewise. (debug_to_region_ok_for_hw_watchpoint): Likewise. (debug_to_can_accel_watchpoint_condition): Likewise. (debug_to_stopped_data_address): Likewise. (debug_to_watchpoint_addr_within_range): Likewise. (debug_to_insert_hw_breakpoint): Likewise. (debug_to_remove_hw_breakpoint): Likewise. (debug_to_insert_watchpoint): Likewise. (debug_to_remove_watchpoint): Likewise. gdb/gdbserver/ * server.c (handle_query): strcpy() the returned string from paddress() instead of sprintf(). * utils.c (paddress): Return phex_nz(). -- Ozkan --0015174c0d2e2ac4a5048be2c562 Content-Type: application/octet-stream; name="72.diff" Content-Disposition: attachment; filename="72.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gbvzyj2r0 Content-length: 11639 SW5kZXg6IGdkYi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpS Q1MgZmlsZTogL2N2cy9zcmMvc3JjL2dkYi9DaGFuZ2VMb2csdgpyZXRyaWV2 aW5nIHJldmlzaW9uIDEuMTE5NzMuMi4xMgpkaWZmIC11IC1wIC1yMS4xMTk3 My4yLjEyIENoYW5nZUxvZwotLS0gZ2RiL0NoYW5nZUxvZwkyMCBKdWwgMjAx MCAyMjoyMjo1NiAtMDAwMAkxLjExOTczLjIuMTIKKysrIGdkYi9DaGFuZ2VM b2cJMjEgSnVsIDIwMTAgMDk6NDU6MjQgLTAwMDAKQEAgLTEsMyArMSwxOCBA QAorMjAxMC0wNy0yMSAgT3prYW4gU2V6ZXIgIDxzZXplcm96QGdtYWlsLmNv bT4KKworCSogdGFyZ2V0LmMgKGRlYnVnX3RvX2luc2VydF9icmVha3BvaW50 KTogSW5zdGVhZCBvZiBjYXN0aW5nIHRvIHVuc2lnbmVkCisJbG9uZyBhbmQg JWxkLCB1c2UgY29yZV9hZGRyX3RvX3N0cmluZygpIGFuZCAlcyB0byBwcmlu dCBDT1JFX0FERFIgdmFycworCWFuZCBob3N0X2FkZHJlc3NfdG9fc3RyaW5n KCkgYW5kICVzIGZvciBwb2ludGVycy4KKwkoZGVidWdfdG9fcmVtb3ZlX2Jy ZWFrcG9pbnQpOiBMaWtld2lzZS4KKwkoZGVidWdfdG9fcmVnaW9uX29rX2Zv cl9od193YXRjaHBvaW50KTogTGlrZXdpc2UuCisJKGRlYnVnX3RvX2Nhbl9h Y2NlbF93YXRjaHBvaW50X2NvbmRpdGlvbik6IExpa2V3aXNlLgorCShkZWJ1 Z190b19zdG9wcGVkX2RhdGFfYWRkcmVzcyk6IExpa2V3aXNlLgorCShkZWJ1 Z190b193YXRjaHBvaW50X2FkZHJfd2l0aGluX3JhbmdlKTogTGlrZXdpc2Uu CisJKGRlYnVnX3RvX2luc2VydF9od19icmVha3BvaW50KTogTGlrZXdpc2Uu CisJKGRlYnVnX3RvX3JlbW92ZV9od19icmVha3BvaW50KTogTGlrZXdpc2Uu CisJKGRlYnVnX3RvX2luc2VydF93YXRjaHBvaW50KTogTGlrZXdpc2UuCisJ KGRlYnVnX3RvX3JlbW92ZV93YXRjaHBvaW50KTogTGlrZXdpc2UuCisKIDIw MTAtMDctMjAgIEphbiBLcmF0b2NodmlsICA8amFuLmtyYXRvY2h2aWxAcmVk aGF0LmNvbT4KIAogCSogc3ltZmlsZS5jIChmaW5kX3NlcGFyYXRlX2RlYnVn X2ZpbGVfYnlfZGVidWdsaW5rKTogUmVtb3ZlCkluZGV4OiBnZGIvdGFyZ2V0 LmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9zcmMv c3JjL2dkYi90YXJnZXQuYyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4yNTkK ZGlmZiAtdSAtcCAtcjEuMjU5IHRhcmdldC5jCi0tLSBnZGIvdGFyZ2V0LmMJ NyBKdWwgMjAxMCAxNjoxNToxNyAtMDAwMAkxLjI1OQorKysgZ2RiL3Rhcmdl dC5jCTIxIEp1bCAyMDEwIDA5OjQ1OjI2IC0wMDAwCkBAIC0zMjcwLDggKzMy NzAsOCBAQCBkZWJ1Z190b19pbnNlcnRfYnJlYWtwb2ludCAoc3RydWN0IGdk YmFyCiAgIHJldHZhbCA9IGRlYnVnX3RhcmdldC50b19pbnNlcnRfYnJlYWtw b2ludCAoZ2RiYXJjaCwgYnBfdGd0KTsKIAogICBmcHJpbnRmX3VuZmlsdGVy ZWQgKGdkYl9zdGRsb2csCi0JCSAgICAgICJ0YXJnZXRfaW5zZXJ0X2JyZWFr cG9pbnQgKDB4JWx4LCB4eHgpID0gJWxkXG4iLAotCQkgICAgICAodW5zaWdu ZWQgbG9uZykgYnBfdGd0LT5wbGFjZWRfYWRkcmVzcywKKwkJICAgICAgInRh cmdldF9pbnNlcnRfYnJlYWtwb2ludCAoJXMsIHh4eCkgPSAlbGRcbiIsCisJ CSAgICAgIGNvcmVfYWRkcl90b19zdHJpbmcgKGJwX3RndC0+cGxhY2VkX2Fk ZHJlc3MpLAogCQkgICAgICAodW5zaWduZWQgbG9uZykgcmV0dmFsKTsKICAg cmV0dXJuIHJldHZhbDsKIH0KQEAgLTMyODUsOCArMzI4NSw4IEBAIGRlYnVn X3RvX3JlbW92ZV9icmVha3BvaW50IChzdHJ1Y3QgZ2RiYXIKICAgcmV0dmFs ID0gZGVidWdfdGFyZ2V0LnRvX3JlbW92ZV9icmVha3BvaW50IChnZGJhcmNo LCBicF90Z3QpOwogCiAgIGZwcmludGZfdW5maWx0ZXJlZCAoZ2RiX3N0ZGxv ZywKLQkJICAgICAgInRhcmdldF9yZW1vdmVfYnJlYWtwb2ludCAoMHglbHgs IHh4eCkgPSAlbGRcbiIsCi0JCSAgICAgICh1bnNpZ25lZCBsb25nKSBicF90 Z3QtPnBsYWNlZF9hZGRyZXNzLAorCQkgICAgICAidGFyZ2V0X3JlbW92ZV9i cmVha3BvaW50ICglcywgeHh4KSA9ICVsZFxuIiwKKwkJICAgICAgY29yZV9h ZGRyX3RvX3N0cmluZyAoYnBfdGd0LT5wbGFjZWRfYWRkcmVzcyksCiAJCSAg ICAgICh1bnNpZ25lZCBsb25nKSByZXR2YWwpOwogICByZXR1cm4gcmV0dmFs OwogfQpAQCAtMzMxNSwxMCArMzMxNSw5IEBAIGRlYnVnX3RvX3JlZ2lvbl9v a19mb3JfaHdfd2F0Y2hwb2ludCAoQ08KICAgcmV0dmFsID0gZGVidWdfdGFy Z2V0LnRvX3JlZ2lvbl9va19mb3JfaHdfd2F0Y2hwb2ludCAoYWRkciwgbGVu KTsKIAogICBmcHJpbnRmX3VuZmlsdGVyZWQgKGdkYl9zdGRsb2csCi0JCSAg ICAgICJ0YXJnZXRfcmVnaW9uX29rX2Zvcl9od193YXRjaHBvaW50ICglbGQs ICVsZCkgPSAweCVseFxuIiwKLQkJICAgICAgKHVuc2lnbmVkIGxvbmcpIGFk ZHIsCi0JCSAgICAgICh1bnNpZ25lZCBsb25nKSBsZW4sCi0JCSAgICAgICh1 bnNpZ25lZCBsb25nKSByZXR2YWwpOworCQkgICAgICAidGFyZ2V0X3JlZ2lv bl9va19mb3JfaHdfd2F0Y2hwb2ludCAoJXMsICVsZCkgPSAlc1xuIiwKKwkJ ICAgICAgY29yZV9hZGRyX3RvX3N0cmluZyAoYWRkciksICh1bnNpZ25lZCBs b25nKSBsZW4sCisJCSAgICAgIGNvcmVfYWRkcl90b19zdHJpbmcgKHJldHZh bCkpOwogICByZXR1cm4gcmV0dmFsOwogfQogCkBAIC0zMzMxLDkgKzMzMzAs OSBAQCBkZWJ1Z190b19jYW5fYWNjZWxfd2F0Y2hwb2ludF9jb25kaXRpb24g CiAgIHJldHZhbCA9IGRlYnVnX3RhcmdldC50b19jYW5fYWNjZWxfd2F0Y2hw b2ludF9jb25kaXRpb24gKGFkZHIsIGxlbiwgcncsIGNvbmQpOwogCiAgIGZw cmludGZfdW5maWx0ZXJlZCAoZ2RiX3N0ZGxvZywKLQkJICAgICAgInRhcmdl dF9jYW5fYWNjZWxfd2F0Y2hwb2ludF9jb25kaXRpb24gKDB4JWx4LCAlZCwg JWQsIDB4JWx4KSA9ICVsZFxuIiwKLQkJICAgICAgKHVuc2lnbmVkIGxvbmcp IGFkZHIsIGxlbiwgcncsICh1bnNpZ25lZCBsb25nKSBjb25kLAotCQkgICAg ICAodW5zaWduZWQgbG9uZykgcmV0dmFsKTsKKwkJICAgICAgInRhcmdldF9j YW5fYWNjZWxfd2F0Y2hwb2ludF9jb25kaXRpb24gKCVzLCAlZCwgJWQsICVz KSA9ICVsZFxuIiwKKwkJICAgICAgY29yZV9hZGRyX3RvX3N0cmluZyAoYWRk ciksIGxlbiwgcncsCisJCSAgICAgIGhvc3RfYWRkcmVzc190b19zdHJpbmcg KGNvbmQpLCAodW5zaWduZWQgbG9uZykgcmV0dmFsKTsKICAgcmV0dXJuIHJl dHZhbDsKIH0KIApAQCAtMzM1OCw4ICszMzU3LDggQEAgZGVidWdfdG9fc3Rv cHBlZF9kYXRhX2FkZHJlc3MgKHN0cnVjdCB0YQogICByZXR2YWwgPSBkZWJ1 Z190YXJnZXQudG9fc3RvcHBlZF9kYXRhX2FkZHJlc3MgKHRhcmdldCwgYWRk cik7CiAKICAgZnByaW50Zl91bmZpbHRlcmVkIChnZGJfc3RkbG9nLAotCQkg ICAgICAidGFyZ2V0X3N0b3BwZWRfZGF0YV9hZGRyZXNzIChbMHglbHhdKSA9 ICVsZFxuIiwKLQkJICAgICAgKHVuc2lnbmVkIGxvbmcpKmFkZHIsCisJCSAg ICAgICJ0YXJnZXRfc3RvcHBlZF9kYXRhX2FkZHJlc3MgKFslc10pID0gJWxk XG4iLAorCQkgICAgICBjb3JlX2FkZHJfdG9fc3RyaW5nICgqYWRkciksCiAJ CSAgICAgICh1bnNpZ25lZCBsb25nKXJldHZhbCk7CiAgIHJldHVybiByZXR2 YWw7CiB9CkBAIC0zMzc1LDkgKzMzNzQsOSBAQCBkZWJ1Z190b193YXRjaHBv aW50X2FkZHJfd2l0aGluX3JhbmdlIChzCiAJCQkJCQkJIHN0YXJ0LCBsZW5n dGgpOwogCiAgIGZwcmludGZfZmlsdGVyZWQgKGdkYl9zdGRsb2csCi0JCSAg ICAidGFyZ2V0X3dhdGNocG9pbnRfYWRkcl93aXRoaW5fcmFuZ2UgKDB4JWx4 LCAweCVseCwgJWQpID0gJWRcbiIsCi0JCSAgICAodW5zaWduZWQgbG9uZykg YWRkciwgKHVuc2lnbmVkIGxvbmcpIHN0YXJ0LCBsZW5ndGgsCi0JCSAgICBy ZXR2YWwpOworCQkgICAgInRhcmdldF93YXRjaHBvaW50X2FkZHJfd2l0aGlu X3JhbmdlICglcywgJXMsICVkKSA9ICVkXG4iLAorCQkgICAgY29yZV9hZGRy X3RvX3N0cmluZyAoYWRkciksIGNvcmVfYWRkcl90b19zdHJpbmcgKHN0YXJ0 KSwKKwkJICAgIGxlbmd0aCwgcmV0dmFsKTsKICAgcmV0dXJuIHJldHZhbDsK IH0KIApAQCAtMzM5MCw4ICszMzg5LDggQEAgZGVidWdfdG9faW5zZXJ0X2h3 X2JyZWFrcG9pbnQgKHN0cnVjdCBnZAogICByZXR2YWwgPSBkZWJ1Z190YXJn ZXQudG9faW5zZXJ0X2h3X2JyZWFrcG9pbnQgKGdkYmFyY2gsIGJwX3RndCk7 CiAKICAgZnByaW50Zl91bmZpbHRlcmVkIChnZGJfc3RkbG9nLAotCQkgICAg ICAidGFyZ2V0X2luc2VydF9od19icmVha3BvaW50ICgweCVseCwgeHh4KSA9 ICVsZFxuIiwKLQkJICAgICAgKHVuc2lnbmVkIGxvbmcpIGJwX3RndC0+cGxh Y2VkX2FkZHJlc3MsCisJCSAgICAgICJ0YXJnZXRfaW5zZXJ0X2h3X2JyZWFr cG9pbnQgKCVzLCB4eHgpID0gJWxkXG4iLAorCQkgICAgICBjb3JlX2FkZHJf dG9fc3RyaW5nIChicF90Z3QtPnBsYWNlZF9hZGRyZXNzKSwKIAkJICAgICAg KHVuc2lnbmVkIGxvbmcpIHJldHZhbCk7CiAgIHJldHVybiByZXR2YWw7CiB9 CkBAIC0zNDA1LDggKzM0MDQsOCBAQCBkZWJ1Z190b19yZW1vdmVfaHdfYnJl YWtwb2ludCAoc3RydWN0IGdkCiAgIHJldHZhbCA9IGRlYnVnX3RhcmdldC50 b19yZW1vdmVfaHdfYnJlYWtwb2ludCAoZ2RiYXJjaCwgYnBfdGd0KTsKIAog ICBmcHJpbnRmX3VuZmlsdGVyZWQgKGdkYl9zdGRsb2csCi0JCSAgICAgICJ0 YXJnZXRfcmVtb3ZlX2h3X2JyZWFrcG9pbnQgKDB4JWx4LCB4eHgpID0gJWxk XG4iLAotCQkgICAgICAodW5zaWduZWQgbG9uZykgYnBfdGd0LT5wbGFjZWRf YWRkcmVzcywKKwkJICAgICAgInRhcmdldF9yZW1vdmVfaHdfYnJlYWtwb2lu dCAoJXMsIHh4eCkgPSAlbGRcbiIsCisJCSAgICAgIGNvcmVfYWRkcl90b19z dHJpbmcgKGJwX3RndC0+cGxhY2VkX2FkZHJlc3MpLAogCQkgICAgICAodW5z aWduZWQgbG9uZykgcmV0dmFsKTsKICAgcmV0dXJuIHJldHZhbDsKIH0KQEAg LTM0MjAsOSArMzQxOSw5IEBAIGRlYnVnX3RvX2luc2VydF93YXRjaHBvaW50 IChDT1JFX0FERFIgYWQKICAgcmV0dmFsID0gZGVidWdfdGFyZ2V0LnRvX2lu c2VydF93YXRjaHBvaW50IChhZGRyLCBsZW4sIHR5cGUsIGNvbmQpOwogCiAg IGZwcmludGZfdW5maWx0ZXJlZCAoZ2RiX3N0ZGxvZywKLQkJICAgICAgInRh cmdldF9pbnNlcnRfd2F0Y2hwb2ludCAoMHglbHgsICVkLCAlZCwgMHglbGQp ID0gJWxkXG4iLAotCQkgICAgICAodW5zaWduZWQgbG9uZykgYWRkciwgbGVu LCB0eXBlLCAodW5zaWduZWQgbG9uZykgY29uZCwKLQkJICAgICAgKHVuc2ln bmVkIGxvbmcpIHJldHZhbCk7CisJCSAgICAgICJ0YXJnZXRfaW5zZXJ0X3dh dGNocG9pbnQgKCVzLCAlZCwgJWQsICVzKSA9ICVsZFxuIiwKKwkJICAgICAg Y29yZV9hZGRyX3RvX3N0cmluZyAoYWRkciksIGxlbiwgdHlwZSwKKwkJICAg ICAgaG9zdF9hZGRyZXNzX3RvX3N0cmluZyAoY29uZCksICh1bnNpZ25lZCBs b25nKSByZXR2YWwpOwogICByZXR1cm4gcmV0dmFsOwogfQogCkBAIC0zNDM1 LDkgKzM0MzQsOSBAQCBkZWJ1Z190b19yZW1vdmVfd2F0Y2hwb2ludCAoQ09S RV9BRERSIGFkCiAgIHJldHZhbCA9IGRlYnVnX3RhcmdldC50b19yZW1vdmVf d2F0Y2hwb2ludCAoYWRkciwgbGVuLCB0eXBlLCBjb25kKTsKIAogICBmcHJp bnRmX3VuZmlsdGVyZWQgKGdkYl9zdGRsb2csCi0JCSAgICAgICJ0YXJnZXRf cmVtb3ZlX3dhdGNocG9pbnQgKDB4JWx4LCAlZCwgJWQsIDB4JWxkKSA9ICVs ZFxuIiwKLQkJICAgICAgKHVuc2lnbmVkIGxvbmcpIGFkZHIsIGxlbiwgdHlw ZSwgKHVuc2lnbmVkIGxvbmcpIGNvbmQsCi0JCSAgICAgICh1bnNpZ25lZCBs b25nKSByZXR2YWwpOworCQkgICAgICAidGFyZ2V0X3JlbW92ZV93YXRjaHBv aW50ICglcywgJWQsICVkLCAlcykgPSAlbGRcbiIsCisJCSAgICAgIGNvcmVf YWRkcl90b19zdHJpbmcgKGFkZHIpLCBsZW4sIHR5cGUsCisJCSAgICAgIGhv c3RfYWRkcmVzc190b19zdHJpbmcgKGNvbmQpLCAodW5zaWduZWQgbG9uZykg cmV0dmFsKTsKICAgcmV0dXJuIHJldHZhbDsKIH0KIApJbmRleDogZ2RiL2dk YnNlcnZlci9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1Mg ZmlsZTogL2N2cy9zcmMvc3JjL2dkYi9nZGJzZXJ2ZXIvQ2hhbmdlTG9nLHYK cmV0cmlldmluZyByZXZpc2lvbiAxLjM5OApkaWZmIC11IC1wIC1yMS4zOTgg Q2hhbmdlTG9nCi0tLSBnZGIvZ2Ric2VydmVyL0NoYW5nZUxvZwk3IEp1bCAy MDEwIDE2OjE0OjA0IC0wMDAwCTEuMzk4CisrKyBnZGIvZ2Ric2VydmVyL0No YW5nZUxvZwkyMSBKdWwgMjAxMCAwOTo0NToyOCAtMDAwMApAQCAtMSwzICsx LDkgQEAKKzIwMTAtMDctMjEgIE96a2FuIFNlemVyICA8c2V6ZXJvekBnbWFp bC5jb20+CisKKwkqIHNlcnZlci5jIChoYW5kbGVfcXVlcnkpOiBzdHJjcHko KSB0aGUgcmV0dXJuZWQgc3RyaW5nIGZyb20gcGFkZHJlc3MoKQorCWluc3Rl YWQgb2Ygc3ByaW50ZigpLgorCSogdXRpbHMuYyAocGFkZHJlc3MpOiBSZXR1 cm4gcGhleF9ueigpLgorCiAyMDEwLTA3LTA3ICBKb2VsIEJyb2JlY2tlciAg PGJyb2JlY2tlckBhZGFjb3JlLmNvbT4KIAogCSogc2VydmVyLmMgKGhhbmRs ZV92X2NvbnQpOiBDYWxsIG1vdXJuX2luZmVyaW9yIGlmIHByb2Nlc3MKSW5k ZXg6IGdkYi9nZGJzZXJ2ZXIvc2VydmVyLmMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQpSQ1MgZmlsZTogL2N2cy9zcmMvc3JjL2dkYi9nZGJzZXJ2ZXIvc2Vy dmVyLmMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTI1CmRpZmYgLXUgLXAg LXIxLjEyNSBzZXJ2ZXIuYwotLS0gZ2RiL2dkYnNlcnZlci9zZXJ2ZXIuYwk3 IEp1bCAyMDEwIDE2OjE0OjA0IC0wMDAwCTEuMTI1CisrKyBnZGIvZ2Ric2Vy dmVyL3NlcnZlci5jCTIxIEp1bCAyMDEwIDA5OjQ1OjI5IC0wMDAwCkBAIC0x NTM5LDcgKzE1MzksNyBAQCBoYW5kbGVfcXVlcnkgKGNoYXIgKm93bl9idWYs IGludCBwYWNrZXRfCiAKICAgICAgIGlmIChlcnIgPT0gMCkKIAl7Ci0JICBz cHJpbnRmIChvd25fYnVmLCAiJWxseCIsIGFkZHJlc3MpOworCSAgc3RyY3B5 IChvd25fYnVmLCBwYWRkcmVzcyhhZGRyZXNzKSk7CiAJICByZXR1cm47CiAJ fQogICAgICAgZWxzZSBpZiAoZXJyID4gMCkKQEAgLTE1NjMsNyArMTU2Myw3 IEBAIGhhbmRsZV9xdWVyeSAoY2hhciAqb3duX2J1ZiwgaW50IHBhY2tldF8K ICAgICAgIG4gPSAoKnRoZV90YXJnZXQtPmdldF90aWJfYWRkcmVzcykgKHB0 aWQsICZ0bGIpOwogICAgICAgaWYgKG4gPT0gMSkKIAl7Ci0JICBzcHJpbnRm IChvd25fYnVmLCAiJWxseCIsIHRsYik7CisJICBzdHJjcHkgKG93bl9idWYs IHBhZGRyZXNzKHRsYikpOwogCSAgcmV0dXJuOwogCX0KICAgICAgIGVsc2Ug aWYgKG4gPT0gMCkKSW5kZXg6IGdkYi9nZGJzZXJ2ZXIvdXRpbHMuYwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3NyYy9zcmMvZ2Ri L2dkYnNlcnZlci91dGlscy5jLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjIz CmRpZmYgLXUgLXAgLXIxLjIzIHV0aWxzLmMKLS0tIGdkYi9nZGJzZXJ2ZXIv dXRpbHMuYwkxIEp1biAyMDEwIDEzOjIwOjUyIC0wMDAwCTEuMjMKKysrIGdk Yi9nZGJzZXJ2ZXIvdXRpbHMuYwkyMSBKdWwgMjAxMCAwOTo0NToyOSAtMDAw MApAQCAtMjU3LDE3ICsyNTcsNiBAQCB4c25wcmludGYgKGNoYXIgKnN0ciwg c2l6ZV90IHNpemUsIGNvbnN0CiAgIHJldHVybiByZXQ7CiB9CiAKLS8qIENv bnZlcnQgYSBDT1JFX0FERFIgaW50byBhIEhFWCBzdHJpbmcsIGxpa2UgJWx4 LgotICAgVGhlIHJlc3VsdCBpcyBzdG9yZWQgaW4gYSBjaXJjdWxhciBzdGF0 aWMgYnVmZmVyLCBOVU1DRUxMUyBkZWVwLiAgKi8KLQotY2hhciAqCi1wYWRk cmVzcyAoQ09SRV9BRERSIGFkZHIpCi17Ci0gIGNoYXIgKnN0ciA9IGdldF9j ZWxsICgpOwotICB4c25wcmludGYgKHN0ciwgQ0VMTFNJWkUsICIlbHgiLCAo bG9uZykgYWRkcik7Ci0gIHJldHVybiBzdHI7Ci19Ci0KIHN0YXRpYyBjaGFy ICoKIGRlY2ltYWwyc3RyIChjaGFyICpzaWduLCBVTE9OR0VTVCBhZGRyLCBp bnQgd2lkdGgpCiB7CkBAIC0zNzIsMyArMzYxLDEyIEBAIHBoZXhfbnogKFVM T05HRVNUIGwsIGludCBzaXplb2ZfbCkKIAogICByZXR1cm4gc3RyOwogfQor CisvKiBDb252ZXJ0IGEgQ09SRV9BRERSIGludG8gYSBIRVggc3RyaW5nLCBs aWtlICVseC4KKyAgIFRoZSByZXN1bHQgaXMgc3RvcmVkIGluIGEgY2lyY3Vs YXIgc3RhdGljIGJ1ZmZlciwgTlVNQ0VMTFMgZGVlcC4gICovCisKK2NoYXIg KgorcGFkZHJlc3MgKENPUkVfQUREUiBhZGRyKQoreworICByZXR1cm4gcGhl eF9ueiAoYWRkciwgc2l6ZW9mIChDT1JFX0FERFIpKTsKK30K --0015174c0d2e2ac4a5048be2c562--