235700 2022-01-27 01:59:43 -0800 [GTK][a11y] Do not set the children count when serializing objects for the ATSPI cache 2022-01-27 23:01:06 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 230253 1 cgarcia webkit-unassigned aboxhall andresg_22 aperez apinheiro bugs-noreply cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white oldest_to_newest 1834462 0 cgarcia 2022-01-27 01:59:43 -0800 It's confusing the cache if things doesn't happen in the expected order. We handle the children by emitting the children-changed signals. When the children count is set in the cache by AddAccessible signal or as a response to GetItems, atspi sets the accessible children vector size to the given value. If children-changed:add is emitted after that, it's considered a new child and the children vector grows. So, we end up with the double of children, but half of them are just null. 1834463 1 450117 cgarcia 2022-01-27 02:06:36 -0800 Created attachment 450117 Patch 1834493 2 450117 aperez 2022-01-27 05:26:37 -0800 Comment on attachment 450117 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450117&action=review > Source/WebCore/ChangeLog:8 > + It's confusing the cache if things doesn't happen in the expected order. We handle the children by emitting the s/doesn't happen/don't happen/ 1834825 3 cgarcia 2022-01-27 23:01:06 -0800 Committed r288726 (246519@trunk): <https://commits.webkit.org/246519@trunk> 450117 2022-01-27 02:06:36 -0800 2022-01-27 05:26:37 -0800 Patch wcore-atspi-children-changed.diff text/plain 15326 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4Mjc3NTA1NTkzZDkuLjM2N2Q3YzBlNzYyMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDQ1IEBACisyMDIyLTAxLTI3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVthMTF5XSBEbyBub3Qgc2V0IHRoZSBjaGlsZHJl biBjb3VudCB3aGVuIHNlcmlhbGl6aW5nIG9iamVjdHMgZm9yIHRoZSBBVFNQSSBjYWNoZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1NzAwCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQncyBjb25mdXNp bmcgdGhlIGNhY2hlIGlmIHRoaW5ncyBkb2Vzbid0IGhhcHBlbiBpbiB0aGUgZXhwZWN0ZWQgb3Jk ZXIuIFdlIGhhbmRsZSB0aGUgY2hpbGRyZW4gYnkgZW1pdHRpbmcgdGhlCisgICAgICAgIGNoaWxk cmVuLWNoYW5nZWQgc2lnbmFscy4gV2hlbiB0aGUgY2hpbGRyZW4gY291bnQgaXMgc2V0IGluIHRo ZSBjYWNoZSBieSBBZGRBY2Nlc3NpYmxlIHNpZ25hbCBvciBhcyBhIHJlc3BvbnNlCisgICAgICAg IHRvIEdldEl0ZW1zLCBhdHNwaSBzZXRzIHRoZSBhY2Nlc3NpYmxlIGNoaWxkcmVuIHZlY3RvciBz aXplIHRvIHRoZSBnaXZlbiB2YWx1ZS4gSWYgY2hpbGRyZW4tY2hhbmdlZDphZGQgaXMKKyAgICAg ICAgZW1pdHRlZCBhZnRlciB0aGF0LCBpdCdzIGNvbnNpZGVyZWQgYSBuZXcgY2hpbGQgYW5kIHRo ZSBjaGlsZHJlbiB2ZWN0b3IgZ3Jvd3MuIFNvLCB3ZSBlbmQgdXAgd2l0aCB0aGUgZG91YmxlIG9m CisgICAgICAgIGNoaWxkcmVuLCBidXQgaGFsZiBvZiB0aGVtIGFyZSBqdXN0IG51bGwuCisKKyAg ICAgICAgKiBhY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlBdHNwaS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5QXRzcGk6OnJlZ2lzdGVyT2JqZWN0KTogQWRkIHRo ZSByZWdpc3RlcmVkIG9iamVjdCB0byB0aGUgdXBkYXRlIGNhY2hlIGxpc3QuCisgICAgICAgIChX ZWJDb3JlOjpBY2Nlc3NpYmlsaXR5QXRzcGk6OnVucmVnaXN0ZXJPYmplY3QpOiBSZW1vdmUgdGhl IG9iamVjdCBmcm9tIHRoZSBjYWNoZSBhbmQgZW1pdCBSZW1vdmVBY2Nlc3NpYmxlCisgICAgICAg IHNpZ25hbCBpZiBuZWVkZWQuCisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5QXRzcGk6 OnBhcmVudENoYW5nZWQpOiBTdG9wIHJlZ2lzdGVyaW5nIHRoZSBvYmplY3RzIGhlcmUsIHRoZXkg d2lsbCBiZSByZWdpc3RlcmVkIHdoZW4KKyAgICAgICAgYWN0dWFsbHkgbmVlZGVkLiBBbHNvIGRv bid0IGVtaXQgdGhlIHNpZ25hbCBpZiB0aGUgb2JqZWN0IGlzIHBlbmRpbmcsIGJlY2F1c2UgQWRk QWNjZXNzaWJsZSB3aWxsIHVwZGF0ZSB0aGUgY2FjaGUuCisgICAgICAgIChXZWJDb3JlOjpBY2Nl c3NpYmlsaXR5QXRzcGk6OmNoaWxkcmVuQ2hhbmdlZCk6IERvIG5vdCBhZGQgdGhlIHBlbmRpbmcg b2JqZWN0cyB0byB0aGUgY2FjaGUsIHdlIGNhbiBqdXN0IGVtaXQKKyAgICAgICAgdGhlIHNpZ25h bCBub3cgYW5kIGNhY2hlIHdpbGwgYmUgdXBkYXRlZCBsYXRlci4KKyAgICAgICAgKFdlYkNvcmU6 OkFjY2Vzc2liaWxpdHlBdHNwaTo6c3RhdGVDaGFuZ2VkKTogRGl0dG8uCisgICAgICAgIChXZWJD b3JlOjpBY2Nlc3NpYmlsaXR5QXRzcGk6OnRleHRDaGFuZ2VkKTogRGl0dG8uCisgICAgICAgIChX ZWJDb3JlOjpBY2Nlc3NpYmlsaXR5QXRzcGk6OnRleHRBdHRyaWJ1dGVzQ2hhbmdlZCk6IERpdHRv LgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eUF0c3BpOjp0ZXh0Q2FyZXRNb3ZlZCk6 IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eUF0c3BpOjp0ZXh0U2VsZWN0 aW9uQ2hhbmdlZCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eUF0c3Bp Ojp2YWx1ZUNoYW5nZWQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlB dHNwaTo6c2VsZWN0aW9uQ2hhbmdlZCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNz aWJpbGl0eUF0c3BpOjpsb2FkRXZlbnQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vz c2liaWxpdHlBdHNwaTo6Y2FjaGVVcGRhdGVUaW1lckZpcmVkKTogQ29weSB0aGUgbGlzdCBiZWNh dXNlIGFkZFRvQ2FjaGVJZk5lZWRlZCgpIG1pZ2h0IGFkZCBuZXcKKyAgICAgICAgaXRlbXMgdG8g dGhlIHRoYXQgd2UgZG9uJ3Qgd2FudCB0byBwcm9jZXNzIGluIHRoaXMgaXRlcmF0aW9uLgorICAg ICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eUF0c3BpOjphZGRUb0NhY2hlSWZQZW5kaW5nKTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlBdHNwaTo6YWRkQWNjZXNz aWJsZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5QXRzcGk6OnJl bW92ZUFjY2Vzc2libGUpOiBEZWxldGVkLgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRzcGkv QWNjZXNzaWJpbGl0eUF0c3BpLmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nl c3NpYmlsaXR5T2JqZWN0QXRzcGkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0 eU9iamVjdEF0c3BpOjpyZWdpc3Rlck9iamVjdCk6IFJlbW92ZSB0aGUgY2FsbCB0byBhZGRBY2Nl c3NpYmxlLCBpdCdzIG5vdyBkb25lIGluIEFjY2Vzc2liaWxpdHlBdHNwaTo6cmVnaXN0ZXJPYmpl Y3QuCisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGk6OnNlcmlhbGl6 ZSBjb25zdCk6IFBhc3MgLTEgYXMgY2hpbGRyZW4gY291bnQgdG8gZW5zdXJlIHRoZSBjaGlsZHJl biB2ZWN0b3IgaXMKKyAgICAgICAgbm90IG1vZGlmaWVkLgorICAgICAgICAqIGFjY2Vzc2liaWxp dHkvYXRzcGkvQWNjZXNzaWJpbGl0eVJvb3RBdHNwaS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpB Y2Nlc3NpYmlsaXR5Um9vdEF0c3BpOjpzZXJpYWxpemUgY29uc3QpOiBEaXR0by4KKwogMjAyMi0w MS0yNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dUS11bYTExeV0gS2VlcCBhIHJlZmVyZW5jZSB0byB0aGUgcGFyZW50IHdyYXBwZXIgd2l0 aCBBVFNQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9B Y2Nlc3NpYmlsaXR5QXRzcGkuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNw aS9BY2Nlc3NpYmlsaXR5QXRzcGkuY3BwCmluZGV4IDdlMTRhNzQ2YTkzOC4uOTU4NzJmMTAxNWE4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2li aWxpdHlBdHNwaS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9B Y2Nlc3NpYmlsaXR5QXRzcGkuY3BwCkBAIC0zMjksNiArMzI5LDEwIEBAIFN0cmluZyBBY2Nlc3Np YmlsaXR5QXRzcGk6OnJlZ2lzdGVyT2JqZWN0KEFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaSYgYXRz cGlPYmplY3QsCiAgICAgfQogICAgIG1fYXRzcGlPYmplY3RzLmFkZCgmYXRzcGlPYmplY3QsIFdU Rk1vdmUocmVnaXN0ZXJlZE9iamVjdHMpKTsKIAorICAgIG1fY2FjaGVVcGRhdGVMaXN0LmFkZCgm YXRzcGlPYmplY3QpOworICAgIGlmICghbV9jYWNoZVVwZGF0ZVRpbWVyLmlzQWN0aXZlKCkpCisg ICAgICAgIG1fY2FjaGVVcGRhdGVUaW1lci5zdGFydE9uZVNob3QoMF9zKTsKKwogICAgIHJldHVy biBwYXRoOwogfQogCkBAIC0zNDQsMTAgKzM0OCwxNyBAQCB2b2lkIEFjY2Vzc2liaWxpdHlBdHNw aTo6dW5yZWdpc3Rlck9iamVjdChBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkmIGF0c3BpT2JqZWN0 KQogICAgICAgICAgICAgZ19kYnVzX2Nvbm5lY3Rpb25fdW5yZWdpc3Rlcl9vYmplY3QobV9jb25u ZWN0aW9uLmdldCgpLCBpZCk7CiAgICAgfQogCi0gICAgZ19kYnVzX2Nvbm5lY3Rpb25fZW1pdF9z aWduYWwobV9jb25uZWN0aW9uLmdldCgpLCBudWxscHRyLCBhdHNwaU9iamVjdC5wYXRoKCkudXRm OCgpLmRhdGEoKSwgIm9yZy5hMTF5LmF0c3BpLkV2ZW50Lk9iamVjdCIsICJTdGF0ZUNoYW5nZWQi LAorICAgIGNvbnN0IGF1dG8mIHBhdGggPSBhdHNwaU9iamVjdC5wYXRoKCk7CisgICAgZ19kYnVz X2Nvbm5lY3Rpb25fZW1pdF9zaWduYWwobV9jb25uZWN0aW9uLmdldCgpLCBudWxscHRyLCBwYXRo LnV0ZjgoKS5kYXRhKCksICJvcmcuYTExeS5hdHNwaS5FdmVudC5PYmplY3QiLCAiU3RhdGVDaGFu Z2VkIiwKICAgICAgICAgZ192YXJpYW50X25ldygiKHNpaXZhe3N2fSkiLCAiZGVmdW5jdCIsIFRS VUUsIDAsIGdfdmFyaWFudF9uZXdfc3RyaW5nKCIwIiksIG51bGxwdHIpLCBudWxscHRyKTsKIAot ICAgIHJlbW92ZUFjY2Vzc2libGUoYXRzcGlPYmplY3QpOworICAgIGlmICghbV9jYWNoZVVwZGF0 ZUxpc3QucmVtb3ZlKCZhdHNwaU9iamVjdCkgJiYgbV9jYWNoZS5yZW1vdmUocGF0aCkpIHsKKyAg ICAgICAgZ19kYnVzX2Nvbm5lY3Rpb25fZW1pdF9zaWduYWwobV9jb25uZWN0aW9uLmdldCgpLCBu dWxscHRyLCAiL29yZy9hMTF5L2F0c3BpL2NhY2hlIiwgIm9yZy5hMTF5LmF0c3BpLkNhY2hlIiwg IlJlbW92ZUFjY2Vzc2libGUiLAorICAgICAgICAgICAgZ192YXJpYW50X25ldygiKChzbykpIiwg dW5pcXVlTmFtZSgpLCBwYXRoLnV0ZjgoKS5kYXRhKCkpLCBudWxscHRyKTsKKyAgICB9CisKKyAg ICBpZiAobV9jYWNoZVVwZGF0ZUxpc3QuaXNFbXB0eSgpKQorICAgICAgICBtX2NhY2hlVXBkYXRl VGltZXIuc3RvcCgpOwogCiAgICAgYXV0byByZWdpc3RlcmVkT2JqZWN0cyA9IG1fYXRzcGlPYmpl Y3RzLnRha2UoJmF0c3BpT2JqZWN0KTsKICAgICBmb3IgKGF1dG8gaWQgOiByZWdpc3RlcmVkT2Jq ZWN0cykKQEAgLTM4MCwxMyArMzkxLDEwIEBAIHZvaWQgQWNjZXNzaWJpbGl0eUF0c3BpOjpwYXJl bnRDaGFuZ2VkKEFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaSYgYXRzcGlPYmplY3QpCiAgICAgaWYg KCFtX2NsaWVudHMuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBFbWl0IHBh cmVudENoYW5nZWQgb25seSBpZiB0aGUgb2JqZWN0IGlzIGFscmVhZHkgcmVnaXN0ZXJlZCwgb3Ro ZXJ3aXNlIHJlZ2lzdGVyIHRoZSBvYmplY3QsCi0gICAgLy8gd2l0aG91dCBlbWl0dGluZyB0aGUg c2lnbmFsLCBiZWNhdXNlIG9yZy5hMTF5LmF0c3BpLkNhY2hlLkFkZEFjY2Vzc2libGUoKSB3aWxs IHVwZGF0ZSB0aGUgY2FjaGUuCi0gICAgaWYgKGF0c3BpT2JqZWN0LnJlZ2lzdGVyT2JqZWN0KCkp CisgICAgLy8gRG8gbm90IGVtaXQgcGFyZW50LWNoYW5nZWQgZm9yIHBlbmRpbmcgb2JqZWN0cywg c2luY2UgQWRkQWNjZXNzaWJsZSB3aWxsIHVwZGF0ZSB0aGUgY2FjaGUuCisgICAgaWYgKG1fY2Fj aGVVcGRhdGVMaXN0LmNvbnRhaW5zKCZhdHNwaU9iamVjdCkpCiAgICAgICAgIHJldHVybjsKIAot ICAgIGFkZFRvQ2FjaGVJZlBlbmRpbmcoYXRzcGlPYmplY3QpOwotCiAgICAgZ19kYnVzX2Nvbm5l Y3Rpb25fZW1pdF9zaWduYWwobV9jb25uZWN0aW9uLmdldCgpLCBudWxscHRyLCBhdHNwaU9iamVj dC5wYXRoKCkudXRmOCgpLmRhdGEoKSwgIm9yZy5hMTF5LmF0c3BpLkV2ZW50Lk9iamVjdCIsICJQ cm9wZXJ0eUNoYW5nZSIsCiAgICAgICAgIGdfdmFyaWFudF9uZXcoIihzaWl2YXtzdn0pIiwgImFj Y2Vzc2libGUtcGFyZW50IiwgMCwgMCwgYXRzcGlPYmplY3QucGFyZW50UmVmZXJlbmNlKCksIG51 bGxwdHIpLCBudWxscHRyKTsKIH0KQEAgLTQxNyw4ICs0MjUsNiBAQCB2b2lkIEFjY2Vzc2liaWxp dHlBdHNwaTo6Y2hpbGRyZW5DaGFuZ2VkKEFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaSYgYXRzcGlP YmplY3QsCiAgICAgaWYgKG1fY2xpZW50cy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIAot ICAgIGFkZFRvQ2FjaGVJZlBlbmRpbmcoYXRzcGlPYmplY3QpOwotICAgIGFkZFRvQ2FjaGVJZlBl bmRpbmcoY2hpbGQpOwogCiAgICAgZ19kYnVzX2Nvbm5lY3Rpb25fZW1pdF9zaWduYWwobV9jb25u ZWN0aW9uLmdldCgpLCBudWxscHRyLCBhdHNwaU9iamVjdC5wYXRoKCkudXRmOCgpLmRhdGEoKSwg Im9yZy5hMTF5LmF0c3BpLkV2ZW50Lk9iamVjdCIsICJDaGlsZHJlbkNoYW5nZWQiLAogICAgICAg ICBnX3ZhcmlhbnRfbmV3KCIoc2lpdihzbykpIiwgY2hhbmdlID09IENoaWxkcmVuQ2hhbmdlZDo6 QWRkZWQgPyAiYWRkIiA6ICJyZW1vdmUiLCBjaGlsZC5pbmRleEluUGFyZW50Rm9yQ2hpbGRyZW5D aGFuZ2VkKGNoYW5nZSksCkBAIC00MzQsNyArNDQwLDYgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5QXRz cGk6OmNoaWxkcmVuQ2hhbmdlZChBY2Nlc3NpYmlsaXR5Um9vdEF0c3BpJiByb290T2JqZWN0LCBB Y2MKICAgICBpZiAobV9jbGllbnRzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAg YWRkVG9DYWNoZUlmUGVuZGluZyhjaGlsZCk7CiAKICAgICBnX2RidXNfY29ubmVjdGlvbl9lbWl0 X3NpZ25hbChtX2Nvbm5lY3Rpb24uZ2V0KCksIG51bGxwdHIsIHJvb3RPYmplY3QucGF0aCgpLnV0 ZjgoKS5kYXRhKCksICJvcmcuYTExeS5hdHNwaS5FdmVudC5PYmplY3QiLCAiQ2hpbGRyZW5DaGFu Z2VkIiwKICAgICAgICAgZ192YXJpYW50X25ldygiKHNpaXYoc28pKSIsIGNoYW5nZSA9PSBDaGls ZHJlbkNoYW5nZWQ6OkFkZGVkID8gImFkZCIgOiAicmVtb3ZlIiwgMCwKQEAgLTQ1Myw4ICs0NTgs NiBAQCB2b2lkIEFjY2Vzc2liaWxpdHlBdHNwaTo6c3RhdGVDaGFuZ2VkKEFjY2Vzc2liaWxpdHlP YmplY3RBdHNwaSYgYXRzcGlPYmplY3QsIGNvbgogICAgIGlmICghc2hvdWxkRW1pdFNpZ25hbCgi T2JqZWN0IiwgIlN0YXRlQ2hhbmdlZCIsIG5hbWUpKQogICAgICAgICByZXR1cm47CiAKLSAgICBh ZGRUb0NhY2hlSWZQZW5kaW5nKGF0c3BpT2JqZWN0KTsKLQogICAgIGdfZGJ1c19jb25uZWN0aW9u X2VtaXRfc2lnbmFsKG1fY29ubmVjdGlvbi5nZXQoKSwgbnVsbHB0ciwgYXRzcGlPYmplY3QucGF0 aCgpLnV0ZjgoKS5kYXRhKCksICJvcmcuYTExeS5hdHNwaS5FdmVudC5PYmplY3QiLCAiU3RhdGVD aGFuZ2VkIiwKICAgICAgICAgZ192YXJpYW50X25ldygiKHNpaXZhe3N2fSkiLCBuYW1lLCB2YWx1 ZSwgMCwgZ192YXJpYW50X25ld19zdHJpbmcoIjAiKSwgbnVsbHB0ciksIG51bGxwdHIpOwogfQpA QCAtNDcxLDggKzQ3NCw2IEBAIHZvaWQgQWNjZXNzaWJpbGl0eUF0c3BpOjp0ZXh0Q2hhbmdlZChB Y2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkmIGF0c3BpT2JqZWN0LCBjb25zCiAgICAgaWYgKCFzaG91 bGRFbWl0U2lnbmFsKCJPYmplY3QiLCAiVGV4dENoYW5nZWQiLCBjaGFuZ2VUeXBlKSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgYWRkVG9DYWNoZUlmUGVuZGluZyhhdHNwaU9iamVjdCk7Ci0KICAg ICBnX2RidXNfY29ubmVjdGlvbl9lbWl0X3NpZ25hbChtX2Nvbm5lY3Rpb24uZ2V0KCksIG51bGxw dHIsIGF0c3BpT2JqZWN0LnBhdGgoKS51dGY4KCkuZGF0YSgpLCAib3JnLmExMXkuYXRzcGkuRXZl bnQuT2JqZWN0IiwgIlRleHRDaGFuZ2VkIiwKICAgICAgICAgZ192YXJpYW50X25ldygiKHNpaXZh e3N2fSkiLCBjaGFuZ2VUeXBlLCBvZmZzZXQsIGxlbmd0aCwgZ192YXJpYW50X25ld19zdHJpbmco dGV4dC5kYXRhKCkpLCBudWxscHRyKSwgbnVsbHB0cik7CiB9CkBAIC00ODUsOCArNDg2LDYgQEAg dm9pZCBBY2Nlc3NpYmlsaXR5QXRzcGk6OnRleHRBdHRyaWJ1dGVzQ2hhbmdlZChBY2Nlc3NpYmls aXR5T2JqZWN0QXRzcGkmIGF0c3BpT2IKICAgICBpZiAoIXNob3VsZEVtaXRTaWduYWwoIk9iamVj dCIsICJUZXh0QXR0cmlidXRlc0NoYW5nZWQiKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgYWRk VG9DYWNoZUlmUGVuZGluZyhhdHNwaU9iamVjdCk7Ci0KICAgICBnX2RidXNfY29ubmVjdGlvbl9l bWl0X3NpZ25hbChtX2Nvbm5lY3Rpb24uZ2V0KCksIG51bGxwdHIsIGF0c3BpT2JqZWN0LnBhdGgo KS51dGY4KCkuZGF0YSgpLCAib3JnLmExMXkuYXRzcGkuRXZlbnQuT2JqZWN0IiwgIlRleHRBdHRy aWJ1dGVzQ2hhbmdlZCIsCiAgICAgICAgIGdfdmFyaWFudF9uZXcoIihzaWl2YXtzdn0pIiwgIiIs IDAsIDAsIGdfdmFyaWFudF9uZXdfc3RyaW5nKCIiKSwgbnVsbHB0ciksIG51bGxwdHIpOwogfQpA QCAtNTAzLDggKzUwMiw2IEBAIHZvaWQgQWNjZXNzaWJpbGl0eUF0c3BpOjp0ZXh0Q2FyZXRNb3Zl ZChBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkmIGF0c3BpT2JqZWN0LCB1CiAgICAgaWYgKCFzaG91 bGRFbWl0U2lnbmFsKCJPYmplY3QiLCAiVGV4dENhcmV0TW92ZWQiKSkKICAgICAgICAgcmV0dXJu OwogCi0gICAgYWRkVG9DYWNoZUlmUGVuZGluZyhhdHNwaU9iamVjdCk7Ci0KICAgICBnX2RidXNf Y29ubmVjdGlvbl9lbWl0X3NpZ25hbChtX2Nvbm5lY3Rpb24uZ2V0KCksIG51bGxwdHIsIGF0c3Bp T2JqZWN0LnBhdGgoKS51dGY4KCkuZGF0YSgpLCAib3JnLmExMXkuYXRzcGkuRXZlbnQuT2JqZWN0 IiwgIlRleHRDYXJldE1vdmVkIiwKICAgICAgICAgZ192YXJpYW50X25ldygiKHNpaXZhe3N2fSki LCAiIiwgY2FyZXRPZmZzZXQsIDAsIGdfdmFyaWFudF9uZXdfc3RyaW5nKCIiKSwgbnVsbHB0ciks IG51bGxwdHIpOwogfQpAQCAtNTE3LDggKzUxNCw2IEBAIHZvaWQgQWNjZXNzaWJpbGl0eUF0c3Bp Ojp0ZXh0U2VsZWN0aW9uQ2hhbmdlZChBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkmIGF0c3BpT2Jq CiAgICAgaWYgKCFzaG91bGRFbWl0U2lnbmFsKCJPYmplY3QiLCAiVGV4dFNlbGVjdGlvbkNoYW5n ZWQiKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgYWRkVG9DYWNoZUlmUGVuZGluZyhhdHNwaU9i amVjdCk7Ci0KICAgICBnX2RidXNfY29ubmVjdGlvbl9lbWl0X3NpZ25hbChtX2Nvbm5lY3Rpb24u Z2V0KCksIG51bGxwdHIsIGF0c3BpT2JqZWN0LnBhdGgoKS51dGY4KCkuZGF0YSgpLCAib3JnLmEx MXkuYXRzcGkuRXZlbnQuT2JqZWN0IiwgIlRleHRTZWxlY3Rpb25DaGFuZ2VkIiwKICAgICAgICAg Z192YXJpYW50X25ldygiKHNpaXZhe3N2fSkiLCAiIiwgMCwgMCwgZ192YXJpYW50X25ld19zdHJp bmcoIiIpLCBudWxscHRyKSwgbnVsbHB0cik7CiB9CkBAIC01MzUsOCArNTMwLDYgQEAgdm9pZCBB Y2Nlc3NpYmlsaXR5QXRzcGk6OnZhbHVlQ2hhbmdlZChBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkm IGF0c3BpT2JqZWN0LCBkb3UKICAgICBpZiAoIXNob3VsZEVtaXRTaWduYWwoIk9iamVjdCIsICJQ cm9wZXJ0eUNoYW5nZSIsICJhY2Nlc3NpYmxlLXZhbHVlIikpCiAgICAgICAgIHJldHVybjsKIAot ICAgIGFkZFRvQ2FjaGVJZlBlbmRpbmcoYXRzcGlPYmplY3QpOwotCiAgICAgZ19kYnVzX2Nvbm5l Y3Rpb25fZW1pdF9zaWduYWwobV9jb25uZWN0aW9uLmdldCgpLCBudWxscHRyLCBhdHNwaU9iamVj dC5wYXRoKCkudXRmOCgpLmRhdGEoKSwgIm9yZy5hMTF5LmF0c3BpLkV2ZW50Lk9iamVjdCIsICJQ cm9wZXJ0eUNoYW5nZSIsCiAgICAgICAgIGdfdmFyaWFudF9uZXcoIihzaWl2YXtzdn0pIiwgImFj Y2Vzc2libGUtdmFsdWUiLCAwLCAwLCBnX3ZhcmlhbnRfbmV3X2RvdWJsZSh2YWx1ZSksIG51bGxw dHIpLCBudWxscHRyKTsKIH0KQEAgLTU1Myw4ICs1NDYsNiBAQCB2b2lkIEFjY2Vzc2liaWxpdHlB dHNwaTo6c2VsZWN0aW9uQ2hhbmdlZChBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkmIGF0c3BpT2Jq ZWN0KQogICAgIGlmICghc2hvdWxkRW1pdFNpZ25hbCgiT2JqZWN0IiwgIlNlbGVjdGlvbkNoYW5n ZWQiKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgYWRkVG9DYWNoZUlmUGVuZGluZyhhdHNwaU9i amVjdCk7Ci0KICAgICBnX2RidXNfY29ubmVjdGlvbl9lbWl0X3NpZ25hbChtX2Nvbm5lY3Rpb24u Z2V0KCksIG51bGxwdHIsIGF0c3BpT2JqZWN0LnBhdGgoKS51dGY4KCkuZGF0YSgpLCAib3JnLmEx MXkuYXRzcGkuRXZlbnQuT2JqZWN0IiwgIlNlbGVjdGlvbkNoYW5nZWQiLAogICAgICAgICBnX3Zh cmlhbnRfbmV3KCIoc2lpdmF7c3Z9KSIsICIiLCAwLCAwLCBnX3ZhcmlhbnRfbmV3X3N0cmluZygi IiksIG51bGxwdHIpLCBudWxscHRyKTsKIH0KQEAgLTU3MSw4ICs1NjIsNiBAQCB2b2lkIEFjY2Vz c2liaWxpdHlBdHNwaTo6bG9hZEV2ZW50KEFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaSYgYXRzcGlP YmplY3QsIENTdHJpbgogICAgIGlmICghc2hvdWxkRW1pdFNpZ25hbCgiRG9jdW1lbnQiLCBldmVu dC5kYXRhKCkpKQogICAgICAgICByZXR1cm47CiAKLSAgICBhZGRUb0NhY2hlSWZQZW5kaW5nKGF0 c3BpT2JqZWN0KTsKLQogICAgIGdfZGJ1c19jb25uZWN0aW9uX2VtaXRfc2lnbmFsKG1fY29ubmVj dGlvbi5nZXQoKSwgbnVsbHB0ciwgYXRzcGlPYmplY3QucGF0aCgpLnV0ZjgoKS5kYXRhKCksICJv cmcuYTExeS5hdHNwaS5FdmVudC5Eb2N1bWVudCIsIGV2ZW50LmRhdGEoKSwKICAgICAgICAgZ192 YXJpYW50X25ldygiKHNpaXZhe3N2fSkiLCAiIiwgMCwgMCwgZ192YXJpYW50X25ld19zdHJpbmco IiIpLCBudWxscHRyKSwgbnVsbHB0cik7CiB9CkBAIC03ODUsNDMgKzc3NCwxMSBAQCB2b2lkIEFj Y2Vzc2liaWxpdHlBdHNwaTo6YWRkVG9DYWNoZUlmTmVlZGVkKEFjY2Vzc2liaWxpdHlPYmplY3RB dHNwaSYgYXRzcGlPYmplYwogICAgICAgICBnX3ZhcmlhbnRfbmV3KCIoQCgiIElURU1fU0lHTkFU VVJFICIpKSIsIGdfdmFyaWFudF9idWlsZGVyX2VuZCgmYnVpbGRlcikpLCBudWxscHRyKTsKIH0K IAotdm9pZCBBY2Nlc3NpYmlsaXR5QXRzcGk6OmFkZFRvQ2FjaGVJZlBlbmRpbmcoQWNjZXNzaWJp bGl0eU9iamVjdEF0c3BpJiBhdHNwaU9iamVjdCkKLXsKLSAgICBpZiAoIW1fY2FjaGVVcGRhdGVM aXN0LnJlbW92ZSgmYXRzcGlPYmplY3QpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBhZGRUb0Nh Y2hlSWZOZWVkZWQoYXRzcGlPYmplY3QpOwotICAgIGlmIChtX2NhY2hlVXBkYXRlTGlzdC5pc0Vt cHR5KCkpCi0gICAgICAgIG1fY2FjaGVVcGRhdGVUaW1lci5zdG9wKCk7Ci19Ci0KIHZvaWQgQWNj ZXNzaWJpbGl0eUF0c3BpOjpjYWNoZVVwZGF0ZVRpbWVyRmlyZWQoKQogewotICAgIHdoaWxlICgh bV9jYWNoZVVwZGF0ZUxpc3QuaXNFbXB0eSgpKQotICAgICAgICBhZGRUb0NhY2hlSWZOZWVkZWQo Km1fY2FjaGVVcGRhdGVMaXN0LnRha2VGaXJzdCgpKTsKLX0KLQotdm9pZCBBY2Nlc3NpYmlsaXR5 QXRzcGk6OmFkZEFjY2Vzc2libGUoQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpJiBhdHNwaU9iamVj dCkKLXsKLSAgICBpZiAoIW1fY29ubmVjdGlvbikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV9j YWNoZVVwZGF0ZUxpc3QuYWRkKCZhdHNwaU9iamVjdCk7Ci0gICAgaWYgKCFtX2NhY2hlVXBkYXRl VGltZXIuaXNBY3RpdmUoKSkKLSAgICAgICAgbV9jYWNoZVVwZGF0ZVRpbWVyLnN0YXJ0T25lU2hv dCgwX3MpOwotfQotCi12b2lkIEFjY2Vzc2liaWxpdHlBdHNwaTo6cmVtb3ZlQWNjZXNzaWJsZShB Y2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkmIGF0c3BpT2JqZWN0KQotewotICAgIGlmIChtX2NhY2hl VXBkYXRlTGlzdC5yZW1vdmUoJmF0c3BpT2JqZWN0KSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAg Y29uc3QgYXV0byYgcGF0aCA9IGF0c3BpT2JqZWN0LnBhdGgoKTsKLSAgICBpZiAoIW1fY2FjaGUu cmVtb3ZlKHBhdGgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBnX2RidXNfY29ubmVjdGlvbl9l bWl0X3NpZ25hbChtX2Nvbm5lY3Rpb24uZ2V0KCksIG51bGxwdHIsICIvb3JnL2ExMXkvYXRzcGkv Y2FjaGUiLCAib3JnLmExMXkuYXRzcGkuQ2FjaGUiLCAiUmVtb3ZlQWNjZXNzaWJsZSIsCi0gICAg ICAgIGdfdmFyaWFudF9uZXcoIigoc28pKSIsIHVuaXF1ZU5hbWUoKSwgcGF0aC51dGY4KCkuZGF0 YSgpKSwgbnVsbHB0cik7CisgICAgYXV0byBjYWNoZVVwZGF0ZUxpc3QgPSBzdGQ6OmV4Y2hhbmdl KG1fY2FjaGVVcGRhdGVMaXN0LCB7IH0pOworICAgIGZvciAoYXV0byYgYXRzcGlPYmplY3QgOiBj YWNoZVVwZGF0ZUxpc3QpCisgICAgICAgIGFkZFRvQ2FjaGVJZk5lZWRlZCgqYXRzcGlPYmplY3Qp OwogfQogCiB2b2lkIEFjY2Vzc2liaWxpdHlBdHNwaTo6Y2FjaGVDbGVhclRpbWVyRmlyZWQoKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmls aXR5QXRzcGkuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJp bGl0eUF0c3BpLmgKaW5kZXggZTlmMjUyYTFlOTNiLi4yMTA0YTQwMjMyMzkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eUF0c3BpLmgK KysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5QXRz cGkuaApAQCAtODAsOCArODAsNiBAQCBwdWJsaWM6CiAKICAgICBzdGF0aWMgY29uc3QgY2hhciog bG9jYWxpemVkUm9sZU5hbWUoQWNjZXNzaWJpbGl0eVJvbGUpOwogCi0gICAgdm9pZCBhZGRBY2Nl c3NpYmxlKEFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaSYpOwotCiAjaWYgRU5BQkxFKERFVkVMT1BF Ul9NT0RFKQogICAgIHVzaW5nIE5vdGlmaWNhdGlvbk9ic2VydmVyUGFyYW1ldGVyID0gc3RkOjp2 YXJpYW50PHN0ZDo6bnVsbHB0cl90LCBTdHJpbmcsIGJvb2wsIHVuc2lnbmVkLCBSZWY8QWNjZXNz aWJpbGl0eU9iamVjdEF0c3BpPj47CiAgICAgdXNpbmcgTm90aWZpY2F0aW9uT2JzZXJ2ZXIgPSBG dW5jdGlvbjx2b2lkKEFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaSYsIGNvbnN0IGNoYXIqLCBOb3Rp ZmljYXRpb25PYnNlcnZlclBhcmFtZXRlcik+OwpAQCAtMTA3LDggKzEwNSw2IEBAIHByaXZhdGU6 CiAKICAgICB2b2lkIGVuc3VyZUNhY2hlKCk7CiAgICAgdm9pZCBhZGRUb0NhY2hlSWZOZWVkZWQo QWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpJik7Ci0gICAgdm9pZCBhZGRUb0NhY2hlSWZQZW5kaW5n KEFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaSYpOwotICAgIHZvaWQgcmVtb3ZlQWNjZXNzaWJsZShB Y2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkmKTsKICAgICB2b2lkIGNhY2hlVXBkYXRlVGltZXJGaXJl ZCgpOwogICAgIHZvaWQgY2FjaGVDbGVhclRpbWVyRmlyZWQoKTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGku Y3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5T2Jq ZWN0QXRzcGkuY3BwCmluZGV4IDBiMDJiMGFhY2UyYS4uZWJkOTU1MzBmZmRjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlPYmplY3RB dHNwaS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3Np YmlsaXR5T2JqZWN0QXRzcGkuY3BwCkBAIC01MDksOCArNTA5LDYgQEAgYm9vbCBBY2Nlc3NpYmls aXR5T2JqZWN0QXRzcGk6OnJlZ2lzdGVyT2JqZWN0KCkKICAgICAgICAgaW50ZXJmYWNlcy5hcHBl bmQoeyBjb25zdF9jYXN0PEdEQnVzSW50ZXJmYWNlSW5mbyo+KCZ3ZWJraXRfdGFibGVfY2VsbF9p bnRlcmZhY2UpLCAmc190YWJsZUNlbGxGdW5jdGlvbnMgfSk7CiAKICAgICBtX3BhdGggPSBBY2Nl c3NpYmlsaXR5QXRzcGk6OnNpbmdsZXRvbigpLnJlZ2lzdGVyT2JqZWN0KCp0aGlzLCBXVEZNb3Zl KGludGVyZmFjZXMpKTsKLSAgICBBY2Nlc3NpYmlsaXR5QXRzcGk6OnNpbmdsZXRvbigpLmFkZEFj Y2Vzc2libGUoKnRoaXMpOwotCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTExNzQsNyArMTE3 Miw4IEBAIHZvaWQgQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpOjpzZXJpYWxpemUoR1ZhcmlhbnRC dWlsZGVyKiBidWlsZGVyKSBjb25zdAogICAgIGdfdmFyaWFudF9idWlsZGVyX2FkZChidWlsZGVy LCAiQChzbykiLCBwYXJlbnRSZWZlcmVuY2UoKSk7CiAKICAgICBnX3ZhcmlhbnRfYnVpbGRlcl9h ZGQoYnVpbGRlciwgImkiLCBpbmRleEluUGFyZW50KCkpOwotICAgIGdfdmFyaWFudF9idWlsZGVy X2FkZChidWlsZGVyLCAiaSIsIGNoaWxkQ291bnQoKSk7CisgICAgLy8gRG8gbm90IHNldCB0aGUg Y2hpbGRyZW4gY291bnQgaW4gY2FjaGUsIGJlY2F1c2UgY2hpbGRyZW4gYXJlIGhhbmRsZWQgYnkg Y2hpbGRyZW4tY2hhbmdlZCBzaWduYWxzLgorICAgIGdfdmFyaWFudF9idWlsZGVyX2FkZChidWls ZGVyLCAiaSIsIC0xKTsKIAogICAgIEdWYXJpYW50QnVpbGRlciBpbnRlcmZhY2VzID0gR19WQVJJ QU5UX0JVSUxERVJfSU5JVChHX1ZBUklBTlRfVFlQRSgiYXMiKSk7CiAgICAgYnVpbGRJbnRlcmZh Y2VzKCZpbnRlcmZhY2VzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvYXRzcGkvQWNjZXNzaWJpbGl0eVJvb3RBdHNwaS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlSb290QXRzcGkuY3BwCmluZGV4IGY5YmE2Mjcz MWYxMS4uNzJjMjNlZjA4NWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlSb290QXRzcGkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eVJvb3RBdHNwaS5jcHAKQEAgLTIzNCw3 ICsyMzQsOCBAQCB2b2lkIEFjY2Vzc2liaWxpdHlSb290QXRzcGk6OnNlcmlhbGl6ZShHVmFyaWFu dEJ1aWxkZXIqIGJ1aWxkZXIpIGNvbnN0CiAgICAgZ192YXJpYW50X2J1aWxkZXJfYWRkKGJ1aWxk ZXIsICJAKHNvKSIsIHBhcmVudFJlZmVyZW5jZSgpKTsKIAogICAgIGdfdmFyaWFudF9idWlsZGVy X2FkZChidWlsZGVyLCAiaSIsIDApOwotICAgIGdfdmFyaWFudF9idWlsZGVyX2FkZChidWlsZGVy LCAiaSIsIGNoaWxkKCkgPyAxIDogMCk7CisgICAgLy8gRG8gbm90IHNldCB0aGUgY2hpbGRyZW4g Y291bnQgaW4gY2FjaGUsIGJlY2F1c2UgY2hpbGQgaXMgaGFuZGxlZCBieSBjaGlsZHJlbi1jaGFu Z2VkIHNpZ25hbHMuCisgICAgZ192YXJpYW50X2J1aWxkZXJfYWRkKGJ1aWxkZXIsICJpIiwgLTEp OwogCiAgICAgR1ZhcmlhbnRCdWlsZGVyIGludGVyZmFjZXMgPSBHX1ZBUklBTlRfQlVJTERFUl9J TklUKEdfVkFSSUFOVF9UWVBFKCJhcyIpKTsKICAgICBnX3ZhcmlhbnRfYnVpbGRlcl9hZGQoJmlu dGVyZmFjZXMsICJzIiwgd2Via2l0X2FjY2Vzc2libGVfaW50ZXJmYWNlLm5hbWUpOwo=