122968 2013-10-17 09:55:27 -0700 [ATK] Use atk_object_notify_state_change instead of manually emitting signals 2013-10-21 07:00:31 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 mario obzhirov aboxhall apinheiro cfleizach commit-queue dmazzoni jdiggs obzhirov webkit-bug-importer oldest_to_newest 940811 0 mario 2013-10-17 09:55:27 -0700 Using atk_object_notify_state_change() instead of manually calling g_signal_emit_by_name() has the clear benefit that we don't emit by mistake an incorrect change of state, since we are forced to use values from the AtkState enum instead of raw strings. We should change it in AXObjectCacheAtk.cpp to avoid further confusion. [1]https://developer.gnome.org/atk/stable/AtkObject.html#atk-object-notify-state-change 940812 1 webkit-bug-importer 2013-10-17 09:56:01 -0700 <rdar://problem/15251851> 940813 2 obzhirov 2013-10-17 09:58:28 -0700 I'll do refactoring for this one. 941131 3 214553 obzhirov 2013-10-18 03:09:26 -0700 Created attachment 214553 Patch 941754 4 214715 obzhirov 2013-10-21 01:53:11 -0700 Created attachment 214715 Patch 941818 5 214715 mario 2013-10-21 05:30:17 -0700 Comment on attachment 214715 Patch Lgtm as a partial patch, but you still need to change a few more places: accessibility/atk/WebKitAccessibleWrapperAtk.cpp editing/atk/FrameSelectionAtk.cpp 941819 6 obzhirov 2013-10-21 05:34:24 -0700 (In reply to comment #5) > (From update of attachment 214715 [details]) > Lgtm as a partial patch, but you still need to change a few more places: > > accessibility/atk/WebKitAccessibleWrapperAtk.cpp > editing/atk/FrameSelectionAtk.cpp Thanks, will do now. 941826 7 214734 obzhirov 2013-10-21 06:46:34 -0700 Created attachment 214734 Patch 941830 8 214734 mario 2013-10-21 06:57:38 -0700 Comment on attachment 214734 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=214734&action=review lgtm > Source/WebCore/ChangeLog:3 > + [ATK] Use atk_object_notify_state_change instead of manuall emitting signals manuall -> manually Anyway, that was my fault while reporting the bug, so I will push it manually for you and fix that before landing 941831 9 mario 2013-10-21 07:00:31 -0700 Committed r157718: <http://trac.webkit.org/changeset/157718> 214553 2013-10-18 03:09:26 -0700 2013-10-21 01:53:06 -0700 Patch bug-122968-20131018110938.patch text/plain 6026 obzhirov U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3NTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzQxOTgyZGFiZmQ4MmM4 NWYwNzIzMGQ0ODI3NWM5YjZiYjM3OTc1Zi4uNWE1MWVhNDQwOGVlMDFjN2QzNjI4MmZkNWUwOGMz ZmExNTY0M2UwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTEwLTE4ICBBbnRv biBPYnpoaXJvdiAgPGEub2J6aGlyb3ZAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0FUS10gVXNl IGF0a19vYmplY3Rfbm90aWZ5X3N0YXRlX2NoYW5nZSBpbnN0ZWFkIG9mIG1hbnVhbGwgZW1pdHRp bmcgc2lnbmFscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTIyOTY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUmVmYWN0b3IgZW1pdHRpbmcgInN0YXRlLWNoYW5nZSIgZXZlbnQgdG8gdXNlIGF0a19vYmpl Y3Rfbm90aWZ5X3N0YXRlX2NoYW5nZQorICAgICAgICBpbnN0ZWFkIG9mIHVzaW5nIGdfc2lnbmFs X2VtaXRfYnlfbmFtZS4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRrL0FYT2JqZWN0Q2Fj aGVBdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bm90aWZ5Q2hpbGRyZW5TZWxlY3Rpb25DaGFu Z2UpOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6cG9zdFBsYXRmb3JtTm90aWZp Y2F0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmZyYW1lTG9hZGluZ0V2 ZW50UGxhdGZvcm1Ob3RpZmljYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNo ZTo6aGFuZGxlRm9jdXNlZFVJRWxlbWVudENoYW5nZWQpOgorCiAyMDEzLTEwLTE3ICBBbmRyZWFz IEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBTdHlsZVJ1bGVGb286Om11dGFi bGVQcm9wZXJ0aWVzKCkgc2hvdWxkIHJldHVybiBhIHJlZmVyZW5jZS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL0FYT2JqZWN0Q2FjaGVBdGsuY3BwIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvQVhPYmplY3RDYWNoZUF0ay5jcHAKaW5kZXgg ODhjMGQ4MDA0NTA2ODA3YWRhZWJhNWQ2NGUxMjc2NzQ4MWM5ZGQwYy4uNGQ5YmVmYTVhYjYyNjUw NDVlNzZjNWQwMjg5ZDZjODRmODM1Y2ZiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9hdGsvQVhPYmplY3RDYWNoZUF0ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9hdGsvQVhPYmplY3RDYWNoZUF0ay5jcHAKQEAgLTEyMSwxNSArMTIxLDE1 IEBAIHN0YXRpYyB2b2lkIG5vdGlmeUNoaWxkcmVuU2VsZWN0aW9uQ2hhbmdlKEFjY2Vzc2liaWxp dHlPYmplY3QqIG9iamVjdCkKICAgICAvLyBPbGQgZm9jdXNlZCBvYmplY3QganVzdCBsb3N0IGZv Y3VzLCBzbyBlbWl0IHRoZSBldmVudHMuCiAgICAgaWYgKGF4T2xkRm9jdXNlZE9iamVjdCAmJiBh eEl0ZW0gIT0gYXhPbGRGb2N1c2VkT2JqZWN0KSB7CiAgICAgICAgIGdfc2lnbmFsX2VtaXRfYnlf bmFtZShheE9sZEZvY3VzZWRPYmplY3QsICJmb2N1cy1ldmVudCIsIGZhbHNlKTsKLSAgICAgICAg Z19zaWduYWxfZW1pdF9ieV9uYW1lKGF4T2xkRm9jdXNlZE9iamVjdCwgInN0YXRlLWNoYW5nZSIs ICJmb2N1c2VkIiwgZmFsc2UpOworICAgICAgICBhdGtfb2JqZWN0X25vdGlmeV9zdGF0ZV9jaGFu Z2UoYXhPbGRGb2N1c2VkT2JqZWN0LCBBVEtfU1RBVEVfRk9DVVNFRCwgZmFsc2UpOwogICAgIH0K IAogICAgIC8vIEVtaXQgbmVlZGVkIGV2ZW50cyBmb3IgdGhlIGN1cnJlbnRseSAodW4pc2VsZWN0 ZWQgaXRlbS4KICAgICBpZiAoYXhJdGVtKSB7CiAgICAgICAgIGJvb2wgaXNTZWxlY3RlZCA9IGl0 ZW0tPmlzU2VsZWN0ZWQoKTsKLSAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKGF4SXRlbSwg InN0YXRlLWNoYW5nZSIsICJzZWxlY3RlZCIsIGlzU2VsZWN0ZWQpOworICAgICAgICBhdGtfb2Jq ZWN0X25vdGlmeV9zdGF0ZV9jaGFuZ2UoYXhJdGVtLCBBVEtfU1RBVEVfU0VMRUNURUQsIGlzU2Vs ZWN0ZWQpOwogICAgICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUoYXhJdGVtLCAiZm9jdXMtZXZl bnQiLCBpc1NlbGVjdGVkKTsKLSAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKGF4SXRlbSwg InN0YXRlLWNoYW5nZSIsICJmb2N1c2VkIiwgaXNTZWxlY3RlZCk7CisgICAgICAgIGF0a19vYmpl Y3Rfbm90aWZ5X3N0YXRlX2NoYW5nZShheEl0ZW0sIEFUS19TVEFURV9GT0NVU0VELCBpc1NlbGVj dGVkKTsKICAgICB9CiAKICAgICAvLyBVcGRhdGUgcG9pbnRlcnMgdG8gdGhlIHByZXZpb3VzbHkg aW52b2x2ZWQgb2JqZWN0cy4KQEAgLTE0NiwxMSArMTQ2LDExIEBAIHZvaWQgQVhPYmplY3RDYWNo ZTo6cG9zdFBsYXRmb3JtTm90aWZpY2F0aW9uKEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvcmVPYmpl Y3QsIEFYCiAgICAgaWYgKG5vdGlmaWNhdGlvbiA9PSBBWENoZWNrZWRTdGF0ZUNoYW5nZWQpIHsK ICAgICAgICAgaWYgKCFjb3JlT2JqZWN0LT5pc0NoZWNrYm94T3JSYWRpbygpKQogICAgICAgICAg ICAgcmV0dXJuOwotICAgICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUoYXhPYmplY3QsICJzdGF0 ZS1jaGFuZ2UiLCAiY2hlY2tlZCIsIGNvcmVPYmplY3QtPmlzQ2hlY2tlZCgpKTsKKyAgICAgICAg YXRrX29iamVjdF9ub3RpZnlfc3RhdGVfY2hhbmdlKGF4T2JqZWN0LCBBVEtfU1RBVEVfQ0hFQ0tF RCwgY29yZU9iamVjdC0+aXNDaGVja2VkKCkpOwogICAgIH0gZWxzZSBpZiAobm90aWZpY2F0aW9u ID09IEFYU2VsZWN0ZWRDaGlsZHJlbkNoYW5nZWQgfHwgbm90aWZpY2F0aW9uID09IEFYTWVudUxp c3RWYWx1ZUNoYW5nZWQpIHsKICAgICAgICAgaWYgKG5vdGlmaWNhdGlvbiA9PSBBWE1lbnVMaXN0 VmFsdWVDaGFuZ2VkICYmIGNvcmVPYmplY3QtPmlzTWVudUxpc3QoKSkgewogICAgICAgICAgICAg Z19zaWduYWxfZW1pdF9ieV9uYW1lKGF4T2JqZWN0LCAiZm9jdXMtZXZlbnQiLCB0cnVlKTsKLSAg ICAgICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShheE9iamVjdCwgInN0YXRlLWNoYW5nZSIs ICJmb2N1c2VkIiwgdHJ1ZSk7CisgICAgICAgICAgICBhdGtfb2JqZWN0X25vdGlmeV9zdGF0ZV9j aGFuZ2UoYXhPYmplY3QsIEFUS19TVEFURV9GT0NVU0VELCB0cnVlKTsKICAgICAgICAgfQogICAg ICAgICBub3RpZnlDaGlsZHJlblNlbGVjdGlvbkNoYW5nZShjb3JlT2JqZWN0KTsKICAgICB9IGVs c2UgaWYgKG5vdGlmaWNhdGlvbiA9PSBBWFZhbHVlQ2hhbmdlZCkgewpAQCAtMTY3LDcgKzE2Nyw3 IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6cG9zdFBsYXRmb3JtTm90aWZpY2F0aW9uKEFjY2Vzc2li aWxpdHlPYmplY3QqIGNvcmVPYmplY3QsIEFYCiAgICAgfSBlbHNlIGlmIChub3RpZmljYXRpb24g PT0gQVhMYXlvdXRDb21wbGV0ZSkKICAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKGF4T2Jq ZWN0LCAic3RhdGUtY2hhbmdlIiwgImxheW91dC1jb21wbGV0ZSIsIHRydWUpOwogICAgIGVsc2Ug aWYgKG5vdGlmaWNhdGlvbiA9PSBBWEludmFsaWRTdGF0dXNDaGFuZ2VkKQotICAgICAgICBnX3Np Z25hbF9lbWl0X2J5X25hbWUoYXhPYmplY3QsICJzdGF0ZS1jaGFuZ2UiLCAiaW52YWxpZC1lbnRy eSIsIGNvcmVPYmplY3QtPmludmFsaWRTdGF0dXMoKSAhPSAiZmFsc2UiKTsKKyAgICAgICAgYXRr X29iamVjdF9ub3RpZnlfc3RhdGVfY2hhbmdlKGF4T2JqZWN0LCBBVEtfU1RBVEVfSU5WQUxJRF9F TlRSWSwgY29yZU9iamVjdC0+aW52YWxpZFN0YXR1cygpICE9ICJmYWxzZSIpOwogfQogCiB2b2lk IEFYT2JqZWN0Q2FjaGU6Om5vZGVUZXh0Q2hhbmdlUGxhdGZvcm1Ob3RpZmljYXRpb24oQWNjZXNz aWJpbGl0eU9iamVjdCogb2JqZWN0LCBBWFRleHRDaGFuZ2UgdGV4dENoYW5nZSwgdW5zaWduZWQg b2Zmc2V0LCBjb25zdCBTdHJpbmcmIHRleHQpCkBAIC0yMzIsMTkgKzIzMiwxOSBAQCB2b2lkIEFY T2JqZWN0Q2FjaGU6OmZyYW1lTG9hZGluZ0V2ZW50UGxhdGZvcm1Ob3RpZmljYXRpb24oQWNjZXNz aWJpbGl0eU9iamVjdCogbwogCiAgICAgc3dpdGNoIChsb2FkaW5nRXZlbnQpIHsKICAgICBjYXNl IEFYT2JqZWN0Q2FjaGU6OkFYTG9hZGluZ1N0YXJ0ZWQ6Ci0gICAgICAgIGdfc2lnbmFsX2VtaXRf YnlfbmFtZShheE9iamVjdCwgInN0YXRlLWNoYW5nZSIsICJidXN5IiwgdHJ1ZSk7CisgICAgICAg IGF0a19vYmplY3Rfbm90aWZ5X3N0YXRlX2NoYW5nZShheE9iamVjdCwgQVRLX1NUQVRFX0JVU1ks IHRydWUpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEFYT2JqZWN0Q2FjaGU6OkFYTG9hZGlu Z1JlbG9hZGVkOgotICAgICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUoYXhPYmplY3QsICJzdGF0 ZS1jaGFuZ2UiLCAiYnVzeSIsIHRydWUpOworICAgICAgICBhdGtfb2JqZWN0X25vdGlmeV9zdGF0 ZV9jaGFuZ2UoYXhPYmplY3QsIEFUS19TVEFURV9CVVNZLCB0cnVlKTsKICAgICAgICAgZ19zaWdu YWxfZW1pdF9ieV9uYW1lKGF4T2JqZWN0LCAicmVsb2FkIik7CiAgICAgICAgIGJyZWFrOwogICAg IGNhc2UgQVhPYmplY3RDYWNoZTo6QVhMb2FkaW5nRmFpbGVkOgogICAgICAgICBnX3NpZ25hbF9l bWl0X2J5X25hbWUoYXhPYmplY3QsICJsb2FkLXN0b3BwZWQiKTsKLSAgICAgICAgZ19zaWduYWxf ZW1pdF9ieV9uYW1lKGF4T2JqZWN0LCAic3RhdGUtY2hhbmdlIiwgImJ1c3kiLCBmYWxzZSk7Cisg ICAgICAgIGF0a19vYmplY3Rfbm90aWZ5X3N0YXRlX2NoYW5nZShheE9iamVjdCwgQVRLX1NUQVRF X0JVU1ksIGZhbHNlKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBBWE9iamVjdENhY2hlOjpB WExvYWRpbmdGaW5pc2hlZDoKICAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKGF4T2JqZWN0 LCAibG9hZC1jb21wbGV0ZSIpOwotICAgICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUoYXhPYmpl Y3QsICJzdGF0ZS1jaGFuZ2UiLCAiYnVzeSIsIGZhbHNlKTsKKyAgICAgICAgYXRrX29iamVjdF9u b3RpZnlfc3RhdGVfY2hhbmdlKGF4T2JqZWN0LCBBVEtfU1RBVEVfQlVTWSwgZmFsc2UpOwogICAg ICAgICBicmVhazsKICAgICB9CiB9CkBAIC0yNTQsMTIgKzI1NCwxMiBAQCB2b2lkIEFYT2JqZWN0 Q2FjaGU6OmhhbmRsZUZvY3VzZWRVSUVsZW1lbnRDaGFuZ2VkKE5vZGUqIG9sZEZvY3VzZWROb2Rl LCBOb2RlKiBuZQogICAgIFJlZlB0cjxBY2Nlc3NpYmlsaXR5T2JqZWN0PiBvbGRPYmplY3QgPSBn ZXRPckNyZWF0ZShvbGRGb2N1c2VkTm9kZSk7CiAgICAgaWYgKG9sZE9iamVjdCkgewogICAgICAg ICBnX3NpZ25hbF9lbWl0X2J5X25hbWUob2xkT2JqZWN0LT53cmFwcGVyKCksICJmb2N1cy1ldmVu dCIsIGZhbHNlKTsKLSAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKG9sZE9iamVjdC0+d3Jh cHBlcigpLCAic3RhdGUtY2hhbmdlIiwgImZvY3VzZWQiLCBmYWxzZSk7CisgICAgICAgIGF0a19v YmplY3Rfbm90aWZ5X3N0YXRlX2NoYW5nZShvbGRPYmplY3QtPndyYXBwZXIoKSwgQVRLX1NUQVRF X0ZPQ1VTRUQsIGZhbHNlKTsKICAgICB9CiAgICAgUmVmUHRyPEFjY2Vzc2liaWxpdHlPYmplY3Q+ IG5ld09iamVjdCA9IGdldE9yQ3JlYXRlKG5ld0ZvY3VzZWROb2RlKTsKICAgICBpZiAobmV3T2Jq ZWN0KSB7CiAgICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShuZXdPYmplY3QtPndyYXBwZXIo KSwgImZvY3VzLWV2ZW50IiwgdHJ1ZSk7Ci0gICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShu ZXdPYmplY3QtPndyYXBwZXIoKSwgInN0YXRlLWNoYW5nZSIsICJmb2N1c2VkIiwgdHJ1ZSk7Cisg ICAgICAgIGF0a19vYmplY3Rfbm90aWZ5X3N0YXRlX2NoYW5nZShuZXdPYmplY3QtPndyYXBwZXIo KSwgQVRLX1NUQVRFX0ZPQ1VTRUQsIHRydWUpOwogICAgIH0KIH0KIAo= 214715 2013-10-21 01:53:11 -0700 2013-10-21 06:46:29 -0700 Patch bug-122968-20131021095324.patch text/plain 6052 obzhirov U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3NzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTg5NmRmZmNkYjQyM2My YTFkZWIzZTU1MTZkYzFhOWMzNWRkZTcwYS4uY2E4MDgwZThhY2JiMjFkZjQzZjQ3OGFkNTdiMTgw ZDMyM2M1Nzk5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTEwLTE4ICBBbnRv biBPYnpoaXJvdiAgPGEub2J6aGlyb3ZAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0FUS10gVXNl IGF0a19vYmplY3Rfbm90aWZ5X3N0YXRlX2NoYW5nZSBpbnN0ZWFkIG9mIG1hbnVhbGwgZW1pdHRp bmcgc2lnbmFscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTIyOTY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUmVmYWN0b3IgZW1pdHRpbmcgInN0YXRlLWNoYW5nZSIgZXZlbnQgdG8gdXNlIGF0a19vYmpl Y3Rfbm90aWZ5X3N0YXRlX2NoYW5nZQorICAgICAgICBpbnN0ZWFkIG9mIHVzaW5nIGdfc2lnbmFs X2VtaXRfYnlfbmFtZS4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRrL0FYT2JqZWN0Q2Fj aGVBdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bm90aWZ5Q2hpbGRyZW5TZWxlY3Rpb25DaGFu Z2UpOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6cG9zdFBsYXRmb3JtTm90aWZp Y2F0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmZyYW1lTG9hZGluZ0V2 ZW50UGxhdGZvcm1Ob3RpZmljYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNo ZTo6aGFuZGxlRm9jdXNlZFVJRWxlbWVudENoYW5nZWQpOgorCiAyMDEzLTEwLTIxICBTYW50b3No IE1haHRvICA8c2FudG9zaC5tYUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBBU1NFUlRJT04gRkFJ TEVEOiAhc3R5bGUtPnByb3BlcnR5SXNJbXBvcnRhbnQocHJvcGVydHlJRCkgaW4gV2ViQ29yZTo6 c2V0VGV4dERlY29yYXRpb25Qcm9wZXJ0eQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9hdGsvQVhPYmplY3RDYWNoZUF0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2F0ay9BWE9iamVjdENhY2hlQXRrLmNwcAppbmRleCA3MmZkY2MwZWM2NGRhZWE2 NTE4MDM5NmViN2Y5M2I2NDczNTcxNGZhLi5jNzU0Y2Y0ODI3NDc4MmU1YjlkYjZjNWQ1OWNlYjgw OWQ2MGEzZGE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9B WE9iamVjdENhY2hlQXRrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0 ay9BWE9iamVjdENhY2hlQXRrLmNwcApAQCAtMTIxLDE1ICsxMjEsMTUgQEAgc3RhdGljIHZvaWQg bm90aWZ5Q2hpbGRyZW5TZWxlY3Rpb25DaGFuZ2UoQWNjZXNzaWJpbGl0eU9iamVjdCogb2JqZWN0 KQogICAgIC8vIE9sZCBmb2N1c2VkIG9iamVjdCBqdXN0IGxvc3QgZm9jdXMsIHNvIGVtaXQgdGhl IGV2ZW50cy4KICAgICBpZiAoYXhPbGRGb2N1c2VkT2JqZWN0ICYmIGF4SXRlbSAhPSBheE9sZEZv Y3VzZWRPYmplY3QpIHsKICAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKGF4T2xkRm9jdXNl ZE9iamVjdCwgImZvY3VzLWV2ZW50IiwgZmFsc2UpOwotICAgICAgICBnX3NpZ25hbF9lbWl0X2J5 X25hbWUoYXhPbGRGb2N1c2VkT2JqZWN0LCAic3RhdGUtY2hhbmdlIiwgImZvY3VzZWQiLCBmYWxz ZSk7CisgICAgICAgIGF0a19vYmplY3Rfbm90aWZ5X3N0YXRlX2NoYW5nZShheE9sZEZvY3VzZWRP YmplY3QsIEFUS19TVEFURV9GT0NVU0VELCBmYWxzZSk7CiAgICAgfQogCiAgICAgLy8gRW1pdCBu ZWVkZWQgZXZlbnRzIGZvciB0aGUgY3VycmVudGx5ICh1bilzZWxlY3RlZCBpdGVtLgogICAgIGlm IChheEl0ZW0pIHsKICAgICAgICAgYm9vbCBpc1NlbGVjdGVkID0gaXRlbS0+aXNTZWxlY3RlZCgp OwotICAgICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUoYXhJdGVtLCAic3RhdGUtY2hhbmdlIiwg InNlbGVjdGVkIiwgaXNTZWxlY3RlZCk7CisgICAgICAgIGF0a19vYmplY3Rfbm90aWZ5X3N0YXRl X2NoYW5nZShheEl0ZW0sIEFUS19TVEFURV9TRUxFQ1RFRCwgaXNTZWxlY3RlZCk7CiAgICAgICAg IGdfc2lnbmFsX2VtaXRfYnlfbmFtZShheEl0ZW0sICJmb2N1cy1ldmVudCIsIGlzU2VsZWN0ZWQp OwotICAgICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUoYXhJdGVtLCAic3RhdGUtY2hhbmdlIiwg ImZvY3VzZWQiLCBpc1NlbGVjdGVkKTsKKyAgICAgICAgYXRrX29iamVjdF9ub3RpZnlfc3RhdGVf Y2hhbmdlKGF4SXRlbSwgQVRLX1NUQVRFX0ZPQ1VTRUQsIGlzU2VsZWN0ZWQpOwogICAgIH0KIAog ICAgIC8vIFVwZGF0ZSBwb2ludGVycyB0byB0aGUgcHJldmlvdXNseSBpbnZvbHZlZCBvYmplY3Rz LgpAQCAtMTQ2LDExICsxNDYsMTEgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpwb3N0UGxhdGZvcm1O b3RpZmljYXRpb24oQWNjZXNzaWJpbGl0eU9iamVjdCogY29yZU9iamVjdCwgQVgKICAgICBpZiAo bm90aWZpY2F0aW9uID09IEFYQ2hlY2tlZFN0YXRlQ2hhbmdlZCkgewogICAgICAgICBpZiAoIWNv cmVPYmplY3QtPmlzQ2hlY2tib3hPclJhZGlvKCkpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShheE9iamVjdCwgInN0YXRlLWNoYW5nZSIsICJjaGVj a2VkIiwgY29yZU9iamVjdC0+aXNDaGVja2VkKCkpOworICAgICAgICBhdGtfb2JqZWN0X25vdGlm eV9zdGF0ZV9jaGFuZ2UoYXhPYmplY3QsIEFUS19TVEFURV9DSEVDS0VELCBjb3JlT2JqZWN0LT5p c0NoZWNrZWQoKSk7CiAgICAgfSBlbHNlIGlmIChub3RpZmljYXRpb24gPT0gQVhTZWxlY3RlZENo aWxkcmVuQ2hhbmdlZCB8fCBub3RpZmljYXRpb24gPT0gQVhNZW51TGlzdFZhbHVlQ2hhbmdlZCkg ewogICAgICAgICBpZiAobm90aWZpY2F0aW9uID09IEFYTWVudUxpc3RWYWx1ZUNoYW5nZWQgJiYg Y29yZU9iamVjdC0+aXNNZW51TGlzdCgpKSB7CiAgICAgICAgICAgICBnX3NpZ25hbF9lbWl0X2J5 X25hbWUoYXhPYmplY3QsICJmb2N1cy1ldmVudCIsIHRydWUpOwotICAgICAgICAgICAgZ19zaWdu YWxfZW1pdF9ieV9uYW1lKGF4T2JqZWN0LCAic3RhdGUtY2hhbmdlIiwgImZvY3VzZWQiLCB0cnVl KTsKKyAgICAgICAgICAgIGF0a19vYmplY3Rfbm90aWZ5X3N0YXRlX2NoYW5nZShheE9iamVjdCwg QVRLX1NUQVRFX0ZPQ1VTRUQsIHRydWUpOwogICAgICAgICB9CiAgICAgICAgIG5vdGlmeUNoaWxk cmVuU2VsZWN0aW9uQ2hhbmdlKGNvcmVPYmplY3QpOwogICAgIH0gZWxzZSBpZiAobm90aWZpY2F0 aW9uID09IEFYVmFsdWVDaGFuZ2VkKSB7CkBAIC0xNjUsNyArMTY1LDcgQEAgdm9pZCBBWE9iamVj dENhY2hlOjpwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24oQWNjZXNzaWJpbGl0eU9iamVjdCogY29y ZU9iamVjdCwgQVgKIAogICAgICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUoQVRLX09CSkVDVChh eE9iamVjdCksICJwcm9wZXJ0eS1jaGFuZ2U6OmFjY2Vzc2libGUtdmFsdWUiLCAmcHJvcGVydHlW YWx1ZXMsIE5VTEwpOwogICAgIH0gZWxzZSBpZiAobm90aWZpY2F0aW9uID09IEFYSW52YWxpZFN0 YXR1c0NoYW5nZWQpCi0gICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShheE9iamVjdCwgInN0 YXRlLWNoYW5nZSIsICJpbnZhbGlkLWVudHJ5IiwgY29yZU9iamVjdC0+aW52YWxpZFN0YXR1cygp ICE9ICJmYWxzZSIpOworICAgICAgICBhdGtfb2JqZWN0X25vdGlmeV9zdGF0ZV9jaGFuZ2UoYXhP YmplY3QsIEFUS19TVEFURV9JTlZBTElEX0VOVFJZLCBjb3JlT2JqZWN0LT5pbnZhbGlkU3RhdHVz KCkgIT0gImZhbHNlIik7CiB9CiAKIHZvaWQgQVhPYmplY3RDYWNoZTo6bm9kZVRleHRDaGFuZ2VQ bGF0Zm9ybU5vdGlmaWNhdGlvbihBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvYmplY3QsIEFYVGV4dENo YW5nZSB0ZXh0Q2hhbmdlLCB1bnNpZ25lZCBvZmZzZXQsIGNvbnN0IFN0cmluZyYgdGV4dCkKQEAg LTIzMCwxOSArMjMwLDE5IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6ZnJhbWVMb2FkaW5nRXZlbnRQ bGF0Zm9ybU5vdGlmaWNhdGlvbihBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvCiAKICAgICBzd2l0Y2gg KGxvYWRpbmdFdmVudCkgewogICAgIGNhc2UgQVhPYmplY3RDYWNoZTo6QVhMb2FkaW5nU3RhcnRl ZDoKLSAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKGF4T2JqZWN0LCAic3RhdGUtY2hhbmdl IiwgImJ1c3kiLCB0cnVlKTsKKyAgICAgICAgYXRrX29iamVjdF9ub3RpZnlfc3RhdGVfY2hhbmdl KGF4T2JqZWN0LCBBVEtfU1RBVEVfQlVTWSwgdHJ1ZSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNh c2UgQVhPYmplY3RDYWNoZTo6QVhMb2FkaW5nUmVsb2FkZWQ6Ci0gICAgICAgIGdfc2lnbmFsX2Vt aXRfYnlfbmFtZShheE9iamVjdCwgInN0YXRlLWNoYW5nZSIsICJidXN5IiwgdHJ1ZSk7CisgICAg ICAgIGF0a19vYmplY3Rfbm90aWZ5X3N0YXRlX2NoYW5nZShheE9iamVjdCwgQVRLX1NUQVRFX0JV U1ksIHRydWUpOwogICAgICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUoYXhPYmplY3QsICJyZWxv YWQiKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBBWE9iamVjdENhY2hlOjpBWExvYWRpbmdG YWlsZWQ6CiAgICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShheE9iamVjdCwgImxvYWQtc3Rv cHBlZCIpOwotICAgICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUoYXhPYmplY3QsICJzdGF0ZS1j aGFuZ2UiLCAiYnVzeSIsIGZhbHNlKTsKKyAgICAgICAgYXRrX29iamVjdF9ub3RpZnlfc3RhdGVf Y2hhbmdlKGF4T2JqZWN0LCBBVEtfU1RBVEVfQlVTWSwgZmFsc2UpOwogICAgICAgICBicmVhazsK ICAgICBjYXNlIEFYT2JqZWN0Q2FjaGU6OkFYTG9hZGluZ0ZpbmlzaGVkOgogICAgICAgICBnX3Np Z25hbF9lbWl0X2J5X25hbWUoYXhPYmplY3QsICJsb2FkLWNvbXBsZXRlIik7Ci0gICAgICAgIGdf c2lnbmFsX2VtaXRfYnlfbmFtZShheE9iamVjdCwgInN0YXRlLWNoYW5nZSIsICJidXN5IiwgZmFs c2UpOworICAgICAgICBhdGtfb2JqZWN0X25vdGlmeV9zdGF0ZV9jaGFuZ2UoYXhPYmplY3QsIEFU S19TVEFURV9CVVNZLCBmYWxzZSk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KIH0KQEAgLTI1Miwx MiArMjUyLDEyIEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6aGFuZGxlRm9jdXNlZFVJRWxlbWVudENo YW5nZWQoTm9kZSogb2xkRm9jdXNlZE5vZGUsIE5vZGUqIG5lCiAgICAgUmVmUHRyPEFjY2Vzc2li aWxpdHlPYmplY3Q+IG9sZE9iamVjdCA9IGdldE9yQ3JlYXRlKG9sZEZvY3VzZWROb2RlKTsKICAg ICBpZiAob2xkT2JqZWN0KSB7CiAgICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShvbGRPYmpl Y3QtPndyYXBwZXIoKSwgImZvY3VzLWV2ZW50IiwgZmFsc2UpOwotICAgICAgICBnX3NpZ25hbF9l bWl0X2J5X25hbWUob2xkT2JqZWN0LT53cmFwcGVyKCksICJzdGF0ZS1jaGFuZ2UiLCAiZm9jdXNl ZCIsIGZhbHNlKTsKKyAgICAgICAgYXRrX29iamVjdF9ub3RpZnlfc3RhdGVfY2hhbmdlKG9sZE9i amVjdC0+d3JhcHBlcigpLCBBVEtfU1RBVEVfRk9DVVNFRCwgZmFsc2UpOwogICAgIH0KICAgICBS ZWZQdHI8QWNjZXNzaWJpbGl0eU9iamVjdD4gbmV3T2JqZWN0ID0gZ2V0T3JDcmVhdGUobmV3Rm9j dXNlZE5vZGUpOwogICAgIGlmIChuZXdPYmplY3QpIHsKICAgICAgICAgZ19zaWduYWxfZW1pdF9i eV9uYW1lKG5ld09iamVjdC0+d3JhcHBlcigpLCAiZm9jdXMtZXZlbnQiLCB0cnVlKTsKLSAgICAg ICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKG5ld09iamVjdC0+d3JhcHBlcigpLCAic3RhdGUtY2hh bmdlIiwgImZvY3VzZWQiLCB0cnVlKTsKKyAgICAgICAgYXRrX29iamVjdF9ub3RpZnlfc3RhdGVf Y2hhbmdlKG5ld09iamVjdC0+d3JhcHBlcigpLCBBVEtfU1RBVEVfRk9DVVNFRCwgdHJ1ZSk7CiAg ICAgfQogfQogCg== 214734 2013-10-21 06:46:34 -0700 2013-10-21 06:57:37 -0700 Patch bug-122968-20131021144648.patch text/plain 8180 obzhirov U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3NzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTg5NmRmZmNkYjQyM2My YTFkZWIzZTU1MTZkYzFhOWMzNWRkZTcwYS4uYzIxMzEzM2RmMWJiYjZjMmE2ZGU3ZDUwNDljZGEw ZGI5YzI0ZmZjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTEwLTIxICBBbnRv biBPYnpoaXJvdiAgPGEub2J6aGlyb3ZAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0FUS10gVXNl IGF0a19vYmplY3Rfbm90aWZ5X3N0YXRlX2NoYW5nZSBpbnN0ZWFkIG9mIG1hbnVhbGwgZW1pdHRp bmcgc2lnbmFscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTIyOTY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUmVmYWN0b3IgZW1pdHRpbmcgInN0YXRlLWNoYW5nZSIgZXZlbnQgdG8gdXNlIGF0a19vYmpl Y3Rfbm90aWZ5X3N0YXRlX2NoYW5nZQorICAgICAgICBpbnN0ZWFkIG9mIHVzaW5nIGdfc2lnbmFs X2VtaXRfYnlfbmFtZS4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRrL0FYT2JqZWN0Q2Fj aGVBdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bm90aWZ5Q2hpbGRyZW5TZWxlY3Rpb25DaGFu Z2UpOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6cG9zdFBsYXRmb3JtTm90aWZp Y2F0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmZyYW1lTG9hZGluZ0V2 ZW50UGxhdGZvcm1Ob3RpZmljYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNo ZTo6aGFuZGxlRm9jdXNlZFVJRWxlbWVudENoYW5nZWQpOgorICAgICAgICAqIGFjY2Vzc2liaWxp dHkvYXRrL1dlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRrLmNwcDoKKyAgICAgICAgKHdlYmtpdEFj Y2Vzc2libGVEZXRhY2gpOgorICAgICAgICAqIGVkaXRpbmcvYXRrL0ZyYW1lU2VsZWN0aW9uQXRr LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om1heWJlRW1pdFRleHRGb2N1c0NoYW5nZSk6CisKIDIw MTMtMTAtMjEgIFNhbnRvc2ggTWFodG8gIDxzYW50b3NoLm1hQHNhbXN1bmcuY29tPgogCiAgICAg ICAgIEFTU0VSVElPTiBGQUlMRUQ6ICFzdHlsZS0+cHJvcGVydHlJc0ltcG9ydGFudChwcm9wZXJ0 eUlEKSBpbiBXZWJDb3JlOjpzZXRUZXh0RGVjb3JhdGlvblByb3BlcnR5CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9BWE9iamVjdENhY2hlQXRrLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL0FYT2JqZWN0Q2FjaGVBdGsuY3BwCmluZGV4 IDcyZmRjYzBlYzY0ZGFlYTY1MTgwMzk2ZWI3ZjkzYjY0NzM1NzE0ZmEuLmM3NTRjZjQ4Mjc0Nzgy ZTViOWRiNmM1ZDU5Y2ViODA5ZDYwYTNkYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvYXRrL0FYT2JqZWN0Q2FjaGVBdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvYXRrL0FYT2JqZWN0Q2FjaGVBdGsuY3BwCkBAIC0xMjEsMTUgKzEyMSwx NSBAQCBzdGF0aWMgdm9pZCBub3RpZnlDaGlsZHJlblNlbGVjdGlvbkNoYW5nZShBY2Nlc3NpYmls aXR5T2JqZWN0KiBvYmplY3QpCiAgICAgLy8gT2xkIGZvY3VzZWQgb2JqZWN0IGp1c3QgbG9zdCBm b2N1cywgc28gZW1pdCB0aGUgZXZlbnRzLgogICAgIGlmIChheE9sZEZvY3VzZWRPYmplY3QgJiYg YXhJdGVtICE9IGF4T2xkRm9jdXNlZE9iamVjdCkgewogICAgICAgICBnX3NpZ25hbF9lbWl0X2J5 X25hbWUoYXhPbGRGb2N1c2VkT2JqZWN0LCAiZm9jdXMtZXZlbnQiLCBmYWxzZSk7Ci0gICAgICAg IGdfc2lnbmFsX2VtaXRfYnlfbmFtZShheE9sZEZvY3VzZWRPYmplY3QsICJzdGF0ZS1jaGFuZ2Ui LCAiZm9jdXNlZCIsIGZhbHNlKTsKKyAgICAgICAgYXRrX29iamVjdF9ub3RpZnlfc3RhdGVfY2hh bmdlKGF4T2xkRm9jdXNlZE9iamVjdCwgQVRLX1NUQVRFX0ZPQ1VTRUQsIGZhbHNlKTsKICAgICB9 CiAKICAgICAvLyBFbWl0IG5lZWRlZCBldmVudHMgZm9yIHRoZSBjdXJyZW50bHkgKHVuKXNlbGVj dGVkIGl0ZW0uCiAgICAgaWYgKGF4SXRlbSkgewogICAgICAgICBib29sIGlzU2VsZWN0ZWQgPSBp dGVtLT5pc1NlbGVjdGVkKCk7Ci0gICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShheEl0ZW0s ICJzdGF0ZS1jaGFuZ2UiLCAic2VsZWN0ZWQiLCBpc1NlbGVjdGVkKTsKKyAgICAgICAgYXRrX29i amVjdF9ub3RpZnlfc3RhdGVfY2hhbmdlKGF4SXRlbSwgQVRLX1NUQVRFX1NFTEVDVEVELCBpc1Nl bGVjdGVkKTsKICAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKGF4SXRlbSwgImZvY3VzLWV2 ZW50IiwgaXNTZWxlY3RlZCk7Ci0gICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShheEl0ZW0s ICJzdGF0ZS1jaGFuZ2UiLCAiZm9jdXNlZCIsIGlzU2VsZWN0ZWQpOworICAgICAgICBhdGtfb2Jq ZWN0X25vdGlmeV9zdGF0ZV9jaGFuZ2UoYXhJdGVtLCBBVEtfU1RBVEVfRk9DVVNFRCwgaXNTZWxl Y3RlZCk7CiAgICAgfQogCiAgICAgLy8gVXBkYXRlIHBvaW50ZXJzIHRvIHRoZSBwcmV2aW91c2x5 IGludm9sdmVkIG9iamVjdHMuCkBAIC0xNDYsMTEgKzE0NiwxMSBAQCB2b2lkIEFYT2JqZWN0Q2Fj aGU6OnBvc3RQbGF0Zm9ybU5vdGlmaWNhdGlvbihBY2Nlc3NpYmlsaXR5T2JqZWN0KiBjb3JlT2Jq ZWN0LCBBWAogICAgIGlmIChub3RpZmljYXRpb24gPT0gQVhDaGVja2VkU3RhdGVDaGFuZ2VkKSB7 CiAgICAgICAgIGlmICghY29yZU9iamVjdC0+aXNDaGVja2JveE9yUmFkaW8oKSkKICAgICAgICAg ICAgIHJldHVybjsKLSAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKGF4T2JqZWN0LCAic3Rh dGUtY2hhbmdlIiwgImNoZWNrZWQiLCBjb3JlT2JqZWN0LT5pc0NoZWNrZWQoKSk7CisgICAgICAg IGF0a19vYmplY3Rfbm90aWZ5X3N0YXRlX2NoYW5nZShheE9iamVjdCwgQVRLX1NUQVRFX0NIRUNL RUQsIGNvcmVPYmplY3QtPmlzQ2hlY2tlZCgpKTsKICAgICB9IGVsc2UgaWYgKG5vdGlmaWNhdGlv biA9PSBBWFNlbGVjdGVkQ2hpbGRyZW5DaGFuZ2VkIHx8IG5vdGlmaWNhdGlvbiA9PSBBWE1lbnVM aXN0VmFsdWVDaGFuZ2VkKSB7CiAgICAgICAgIGlmIChub3RpZmljYXRpb24gPT0gQVhNZW51TGlz dFZhbHVlQ2hhbmdlZCAmJiBjb3JlT2JqZWN0LT5pc01lbnVMaXN0KCkpIHsKICAgICAgICAgICAg IGdfc2lnbmFsX2VtaXRfYnlfbmFtZShheE9iamVjdCwgImZvY3VzLWV2ZW50IiwgdHJ1ZSk7Ci0g ICAgICAgICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUoYXhPYmplY3QsICJzdGF0ZS1jaGFuZ2Ui LCAiZm9jdXNlZCIsIHRydWUpOworICAgICAgICAgICAgYXRrX29iamVjdF9ub3RpZnlfc3RhdGVf Y2hhbmdlKGF4T2JqZWN0LCBBVEtfU1RBVEVfRk9DVVNFRCwgdHJ1ZSk7CiAgICAgICAgIH0KICAg ICAgICAgbm90aWZ5Q2hpbGRyZW5TZWxlY3Rpb25DaGFuZ2UoY29yZU9iamVjdCk7CiAgICAgfSBl bHNlIGlmIChub3RpZmljYXRpb24gPT0gQVhWYWx1ZUNoYW5nZWQpIHsKQEAgLTE2NSw3ICsxNjUs NyBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBvc3RQbGF0Zm9ybU5vdGlmaWNhdGlvbihBY2Nlc3Np YmlsaXR5T2JqZWN0KiBjb3JlT2JqZWN0LCBBWAogCiAgICAgICAgIGdfc2lnbmFsX2VtaXRfYnlf bmFtZShBVEtfT0JKRUNUKGF4T2JqZWN0KSwgInByb3BlcnR5LWNoYW5nZTo6YWNjZXNzaWJsZS12 YWx1ZSIsICZwcm9wZXJ0eVZhbHVlcywgTlVMTCk7CiAgICAgfSBlbHNlIGlmIChub3RpZmljYXRp b24gPT0gQVhJbnZhbGlkU3RhdHVzQ2hhbmdlZCkKLSAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9u YW1lKGF4T2JqZWN0LCAic3RhdGUtY2hhbmdlIiwgImludmFsaWQtZW50cnkiLCBjb3JlT2JqZWN0 LT5pbnZhbGlkU3RhdHVzKCkgIT0gImZhbHNlIik7CisgICAgICAgIGF0a19vYmplY3Rfbm90aWZ5 X3N0YXRlX2NoYW5nZShheE9iamVjdCwgQVRLX1NUQVRFX0lOVkFMSURfRU5UUlksIGNvcmVPYmpl Y3QtPmludmFsaWRTdGF0dXMoKSAhPSAiZmFsc2UiKTsKIH0KIAogdm9pZCBBWE9iamVjdENhY2hl Ojpub2RlVGV4dENoYW5nZVBsYXRmb3JtTm90aWZpY2F0aW9uKEFjY2Vzc2liaWxpdHlPYmplY3Qq IG9iamVjdCwgQVhUZXh0Q2hhbmdlIHRleHRDaGFuZ2UsIHVuc2lnbmVkIG9mZnNldCwgY29uc3Qg U3RyaW5nJiB0ZXh0KQpAQCAtMjMwLDE5ICsyMzAsMTkgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpm cmFtZUxvYWRpbmdFdmVudFBsYXRmb3JtTm90aWZpY2F0aW9uKEFjY2Vzc2liaWxpdHlPYmplY3Qq IG8KIAogICAgIHN3aXRjaCAobG9hZGluZ0V2ZW50KSB7CiAgICAgY2FzZSBBWE9iamVjdENhY2hl OjpBWExvYWRpbmdTdGFydGVkOgotICAgICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUoYXhPYmpl Y3QsICJzdGF0ZS1jaGFuZ2UiLCAiYnVzeSIsIHRydWUpOworICAgICAgICBhdGtfb2JqZWN0X25v dGlmeV9zdGF0ZV9jaGFuZ2UoYXhPYmplY3QsIEFUS19TVEFURV9CVVNZLCB0cnVlKTsKICAgICAg ICAgYnJlYWs7CiAgICAgY2FzZSBBWE9iamVjdENhY2hlOjpBWExvYWRpbmdSZWxvYWRlZDoKLSAg ICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKGF4T2JqZWN0LCAic3RhdGUtY2hhbmdlIiwgImJ1 c3kiLCB0cnVlKTsKKyAgICAgICAgYXRrX29iamVjdF9ub3RpZnlfc3RhdGVfY2hhbmdlKGF4T2Jq ZWN0LCBBVEtfU1RBVEVfQlVTWSwgdHJ1ZSk7CiAgICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFt ZShheE9iamVjdCwgInJlbG9hZCIpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEFYT2JqZWN0 Q2FjaGU6OkFYTG9hZGluZ0ZhaWxlZDoKICAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKGF4 T2JqZWN0LCAibG9hZC1zdG9wcGVkIik7Ci0gICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShh eE9iamVjdCwgInN0YXRlLWNoYW5nZSIsICJidXN5IiwgZmFsc2UpOworICAgICAgICBhdGtfb2Jq ZWN0X25vdGlmeV9zdGF0ZV9jaGFuZ2UoYXhPYmplY3QsIEFUS19TVEFURV9CVVNZLCBmYWxzZSk7 CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQVhPYmplY3RDYWNoZTo6QVhMb2FkaW5nRmluaXNo ZWQ6CiAgICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShheE9iamVjdCwgImxvYWQtY29tcGxl dGUiKTsKLSAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKGF4T2JqZWN0LCAic3RhdGUtY2hh bmdlIiwgImJ1c3kiLCBmYWxzZSk7CisgICAgICAgIGF0a19vYmplY3Rfbm90aWZ5X3N0YXRlX2No YW5nZShheE9iamVjdCwgQVRLX1NUQVRFX0JVU1ksIGZhbHNlKTsKICAgICAgICAgYnJlYWs7CiAg ICAgfQogfQpAQCAtMjUyLDEyICsyNTIsMTIgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpoYW5kbGVG b2N1c2VkVUlFbGVtZW50Q2hhbmdlZChOb2RlKiBvbGRGb2N1c2VkTm9kZSwgTm9kZSogbmUKICAg ICBSZWZQdHI8QWNjZXNzaWJpbGl0eU9iamVjdD4gb2xkT2JqZWN0ID0gZ2V0T3JDcmVhdGUob2xk Rm9jdXNlZE5vZGUpOwogICAgIGlmIChvbGRPYmplY3QpIHsKICAgICAgICAgZ19zaWduYWxfZW1p dF9ieV9uYW1lKG9sZE9iamVjdC0+d3JhcHBlcigpLCAiZm9jdXMtZXZlbnQiLCBmYWxzZSk7Ci0g ICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShvbGRPYmplY3QtPndyYXBwZXIoKSwgInN0YXRl LWNoYW5nZSIsICJmb2N1c2VkIiwgZmFsc2UpOworICAgICAgICBhdGtfb2JqZWN0X25vdGlmeV9z dGF0ZV9jaGFuZ2Uob2xkT2JqZWN0LT53cmFwcGVyKCksIEFUS19TVEFURV9GT0NVU0VELCBmYWxz ZSk7CiAgICAgfQogICAgIFJlZlB0cjxBY2Nlc3NpYmlsaXR5T2JqZWN0PiBuZXdPYmplY3QgPSBn ZXRPckNyZWF0ZShuZXdGb2N1c2VkTm9kZSk7CiAgICAgaWYgKG5ld09iamVjdCkgewogICAgICAg ICBnX3NpZ25hbF9lbWl0X2J5X25hbWUobmV3T2JqZWN0LT53cmFwcGVyKCksICJmb2N1cy1ldmVu dCIsIHRydWUpOwotICAgICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUobmV3T2JqZWN0LT53cmFw cGVyKCksICJzdGF0ZS1jaGFuZ2UiLCAiZm9jdXNlZCIsIHRydWUpOworICAgICAgICBhdGtfb2Jq ZWN0X25vdGlmeV9zdGF0ZV9jaGFuZ2UobmV3T2JqZWN0LT53cmFwcGVyKCksIEFUS19TVEFURV9G T0NVU0VELCB0cnVlKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRrLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRrLmNwcApp bmRleCAxMGE3MjE1NjA1ZDBkYmQzNGI3MGE1ZWVlODlhYjg1MjZiMTdlYmI3Li4wMDkyNDZjODkz M2JmMzU4NzJlNTk2ZTIzY2M4NmFlMjU3MjE3ZjFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlV3JhcHBlckF0ay5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZVdyYXBwZXJB dGsuY3BwCkBAIC0xMTI1LDcgKzExMjUsNyBAQCB2b2lkIHdlYmtpdEFjY2Vzc2libGVEZXRhY2go V2ViS2l0QWNjZXNzaWJsZSogYWNjZXNzaWJsZSkKICAgICBBU1NFUlQoYWNjZXNzaWJsZS0+bV9v YmplY3QpOwogCiAgICAgaWYgKGFjY2Vzc2libGUtPm1fb2JqZWN0LT5yb2xlVmFsdWUoKSA9PSBX ZWJBcmVhUm9sZSkKLSAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKGFjY2Vzc2libGUsICJz dGF0ZS1jaGFuZ2UiLCAiZGVmdW5jdCIsIHRydWUpOworICAgICAgICBhdGtfb2JqZWN0X25vdGlm eV9zdGF0ZV9jaGFuZ2UoQVRLX09CSkVDVChhY2Nlc3NpYmxlKSwgQVRLX1NUQVRFX0RFRlVOQ1Qs IHRydWUpOwogCiAgICAgLy8gV2UgcmVwbGFjZSB0aGUgV2ViQ29yZSBBY2Nlc3NpYmlsaXR5T2Jq ZWN0IHdpdGggYSBmYWxsYmFjayBvYmplY3QgdGhhdAogICAgIC8vIHByb3ZpZGVzIGRlZmF1bHQg aW1wbGVtZW50YXRpb25zIHRvIGF2b2lkIHJlcGV0aXRpdmUgbnVsbC1jaGVja2luZyBhZnRlcgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9hdGsvRnJhbWVTZWxlY3Rpb25BdGsu Y3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9hdGsvRnJhbWVTZWxlY3Rpb25BdGsuY3BwCmlu ZGV4IGE3OTMzYzQyNmM5MDdmYjU4YWU5MDgxODRhMWM2N2E0NTY3NzU3OWUuLjAzYTIzYTdlNDU4 NzQ4Y2QzOTdlZjA2MzBkZGI1OGRkMjdjMzFkNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvYXRrL0ZyYW1lU2VsZWN0aW9uQXRrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL2F0ay9GcmFtZVNlbGVjdGlvbkF0ay5jcHAKQEAgLTcwLDExICs3MCwxMSBAQCBzdGF0 aWMgdm9pZCBtYXliZUVtaXRUZXh0Rm9jdXNDaGFuZ2UoUGFzc1JlZlB0cjxBY2Nlc3NpYmlsaXR5 T2JqZWN0PiBwcnBPYmplY3QpCiAgICAgaWYgKGF4T2JqZWN0ICE9IG9sZEF4T2JqZWN0KSB7CiAg ICAgICAgIGlmIChvbGRBeE9iamVjdCAmJiBBVEtfSVNfVEVYVChvbGRBeE9iamVjdCkpIHsKICAg ICAgICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShvbGRBeE9iamVjdCwgImZvY3VzLWV2ZW50 IiwgZmFsc2UpOwotICAgICAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKG9sZEF4T2JqZWN0 LCAic3RhdGUtY2hhbmdlIiwgImZvY3VzZWQiLCBmYWxzZSk7CisgICAgICAgICAgICBhdGtfb2Jq ZWN0X25vdGlmeV9zdGF0ZV9jaGFuZ2Uob2xkQXhPYmplY3QsIEFUS19TVEFURV9GT0NVU0VELCBm YWxzZSk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGF4T2JqZWN0ICYmIEFUS19JU19URVhUKGF4 T2JqZWN0KSkgewogICAgICAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKGF4T2JqZWN0LCAi Zm9jdXMtZXZlbnQiLCB0cnVlKTsKLSAgICAgICAgICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShh eE9iamVjdCwgInN0YXRlLWNoYW5nZSIsICJmb2N1c2VkIiwgdHJ1ZSk7CisgICAgICAgICAgICBh dGtfb2JqZWN0X25vdGlmeV9zdGF0ZV9jaGFuZ2UoYXhPYmplY3QsIEFUS19TVEFURV9GT0NVU0VE LCB0cnVlKTsKICAgICAgICAgfQogICAgIH0KIAo=