138711 2014-11-13 14:48:05 -0800 [iOS Wk2] Fire a layout milestone on session restore based on render tree size 2014-11-13 15:27:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser andersca mitz sam simon.fraser oldest_to_newest 1048500 0 simon.fraser 2014-11-13 14:48:05 -0800 [iOS Wk2] Fire a layout milestone on session restore based on render tree size 1048508 1 241507 simon.fraser 2014-11-13 14:53:44 -0800 Created attachment 241507 Patch 1048510 2 241508 simon.fraser 2014-11-13 14:54:38 -0800 Created attachment 241508 Patch 1048511 3 simon.fraser 2014-11-13 14:55:21 -0800 rdar://problem/16033854 1048513 4 241508 andersca 2014-11-13 15:01:53 -0800 Comment on attachment 241508 Patch If you're only adding something to the plist, you don't need to bump the version, and this can be both OS X and iOS. 1048524 5 simon.fraser 2014-11-13 15:27:40 -0800 https://trac.webkit.org/r176097 241507 2014-11-13 14:53:44 -0800 2014-11-13 14:54:35 -0800 Patch bug-138711-20141113145350.patch text/plain 16486 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1ODI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODJlNTA4NDY3N2VkM2Jm YThiZjJkNDkwYWU3OWQ5ZTExODIyNmQ5Zi4uM2Y0YWYyNWM1MDE1ZWQ0YTk2MWFkZjUxMzRmMDI2 OGNjZGZjY2ZiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTExLTEzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgV2syXSBG aXJlIGEgbGF5b3V0IG1pbGVzdG9uZSBvbiBzZXNzaW9uIHJlc3RvcmUgYmFzZWQgb24gcmVuZGVy IHRyZWUgc2l6ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTM4NzExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTmV3IGxheW91dCBtaWxlc3RvbmUgZm9yIHNlc3Npb24gcmVzdG9yZSBiYXNlZCBvbiByZW5k ZXIgdHJlZSBzaXplLiBPbmx5IHVzZWQKKyAgICAgICAgaW4gV0syIGF0IHByZXNlbnQuCisKKyAg ICAgICAgKiBwYWdlL0xheW91dE1pbGVzdG9uZXMuaDoKKwogMjAxNC0xMS0wNCAgSmVyIE5vYmxl ICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIxNzQ4MjMpOiBT ZXZlcmFsIHRlc3RzIGZhaWwgZHVlIHRvIGNhbnBsYXl0aHJvdWdoIGZpcmluZyBiZWZvcmUgdHJh Y2tzIGFyZSBhdmFpbGFibGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAwN2E1MjQyYzJlMTllOTAyNmU3ZTJiYWYw MDM1YjYxZjNmNWU2YWE2Li5hNTFhZTIxZjgyMmU3MzZlZmI2MDhmZDY1ZGZjNGEzNjgxMjI4YzA3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMTQtMTEtMTMgIFNpbW9uIEZyYXNlciAg PHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPUyBXazJdIEZpcmUgYSBsYXlv dXQgbWlsZXN0b25lIG9uIHNlc3Npb24gcmVzdG9yZSBiYXNlZCBvbiByZW5kZXIgdHJlZSBzaXpl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg3MTEK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAg IEFkZCBhIHNlc3Npb24tcmVzdG9yZSBsYXlvdXQgbWlsZXN0b25lIHdoaWNoIGZpcmVzIGFmdGVy IHJlc3RvcmluZyBhIHNlc3Npb24sCisgICAgICAgIHdoZW4gdGhlIHJlbmRlciB0cmVlIHNpemUg cmVhY2hlcyA1MCUgb2YgdGhlIHNpemUgc2F2ZWQgaW4gdGhlIHNlc3Npb24gc3RhdGUuCisKKyAg ICAgICAgKiBTaGFyZWQvU2Vzc2lvblN0YXRlLmg6IEFkZCByZW5kZXJUcmVlU2l6ZS4KKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKGxheW91dE1p bGVzdG9uZXMpOiBUcmFuc2xhdGUgZnJvbSBTUEkgdG8gV2ViQ29yZSBtaWxlc3RvbmVzLgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oOiBOZXcgaU9TLW9u bHkgbWlsZXN0b25lLCBlciwgZXZlbnQuCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL05hdmln YXRpb25TdGF0ZS5tbToKKyAgICAgICAgKFdlYktpdDo6cmVuZGVyaW5nUHJvZ3Jlc3NFdmVudHMp OiBUcmFuc2xhdGUgZnJvbSBXZWJDb3JlIG1pbGVzdG9uZSB0byByZW5kZXJpbmcgZXZlbnQuCisg ICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6V2ViUGFnZVByb3h5KTogSW5pdCBzdHVmZi4KKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjpzZXNzaW9uU3RhdGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OnJlc3RvcmVGcm9tU2Vzc2lvblN0YXRlKTogWmVybyBvdXQgdGhlIHRhcmdldCByZW5kZXIg dHJlZSBzaXplLAorICAgICAgICB0aGVuIGdldCBpdCBvdXQgb2Ygc2Vzc2lvbiBzdGF0ZSBhbmQg c2V0IHRoZSBmbGFnIHRvIHNheSB0aGF0IHdlIGhhdmVuJ3QgcmVhY2hlZCBpdCB5ZXQuCisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bGlzdGVuRm9yTGF5b3V0TWlsZXN0b25lcyk6IFNl dCBhIGZsYWcgdG8ga25vdyB0aGF0IHdlIHNob3VsZCBmaXJlCisgICAgICAgIHRoZSBtaWxlc3Rv bmUuIFRoZSBvdGhlciBtaWxlc3RvbmVzIGdldCBzZW50IGRpcmVjdGx5IHRvIFdlYkNvcmUuCisg ICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9p b3MvV2ViUGFnZVByb3h5SU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpleGNlZWRzUmVuZGVyVHJl ZVNpemVTaXplVGhyZXNob2xkKTogUmV0dXJuIHRydWUgd2hlbiB3ZSd2ZSByZWFjaGVkIDUwJS4K KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRDb21taXRMYXllclRyZWUpOiBGaXJl IHRoZSBtaWxlc3RvbmUgd2hlbiBhcHByb3ByaWF0ZS4KKyAgICAgICAgKiBVSVByb2Nlc3MvbWFj L0xlZ2FjeVNlc3Npb25TdGF0ZUNvZGluZy5jcHA6IFJldiB0aGUgc2Vzc2lvbiBzdGF0ZSBkYXRh IGZvciBpT1MKKyAgICAgICAgKHdoZXJlIGRvaW5nIHNvIGlzIGxlc3MgZGlzcnVwdGl2ZSkuIFN0 YW5kYXJkaXplIHNvbWUgQ0ZTdHJpbmcgY29uc3RhbnRzLgorICAgICAgICAoV2ViS2l0OjplbmNv ZGVTZXNzaW9uSGlzdG9yeSk6IFdyYXAgZm9yIGxlZ2liaWxpdHkuCisgICAgICAgIChXZWJLaXQ6 OmVuY29kZUxlZ2FjeVNlc3Npb25TdGF0ZSk6IE1ha2UgYSBDRk51bWJlciBmb3IgcmVuZGVyIHRy ZWUgc2l6ZSwgYW5kIHN0b3JlCisgICAgICAgIGl0IGluIHRoZSByb290IGRpY3Rpb25hcnkuCisg ICAgICAgIChXZWJLaXQ6OmRlY29kZUJhY2tGb3J3YXJkVHJlZU5vZGUpOiBNb3ZlIGEgY29tbWVu dCB0byBtYXRjaCBhbm90aGVyIHNpbWlsYXIgYmxvY2suCisgICAgICAgIChXZWJLaXQ6OmRlY29k ZUxlZ2FjeVNlc3Npb25TdGF0ZSk6IERlY29kZSByZW5kZXIgdHJlZSBzaXplIGFuZCBzdG9yZSBp dC4KKwogMjAxNC0xMS0xMCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBbaU9TIFdLMl0gU2Nyb2xsIGRlY2VsZXJhdGlvbiByYXRlIGlzIHdyb25nCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0xheW91dE1pbGVzdG9uZXMuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvTGF5b3V0TWlsZXN0b25lcy5oCmluZGV4IDcwMDc0MzRiZjVmYTFhYzdi NGYzOGEwMDFiOWVlYjY0MTU2ZTgxOGQuLmIxMjViYzRlYTc1NzFkY2M4N2IyYzJlMzgzMTFhNDcw YzM1MTdlNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTGF5b3V0TWlsZXN0b25l cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTGF5b3V0TWlsZXN0b25lcy5oCkBAIC0zNyw3 ICszNyw4IEBAIGVudW0gTGF5b3V0TWlsZXN0b25lRmxhZyB7CiAgICAgRGlkSGl0UmVsZXZhbnRS ZXBhaW50ZWRPYmplY3RzQXJlYVRocmVzaG9sZCA9IDEgPDwgMiwKICAgICBEaWRGaXJzdEZsdXNo Rm9ySGVhZGVyTGF5ZXIgPSAxIDw8IDMsCiAgICAgRGlkRmlyc3RMYXlvdXRBZnRlclN1cHByZXNz ZWRJbmNyZW1lbnRhbFJlbmRlcmluZyA9IDEgPDwgNCwKLSAgICBEaWRGaXJzdFBhaW50QWZ0ZXJT dXBwcmVzc2VkSW5jcmVtZW50YWxSZW5kZXJpbmcgPSAxIDw8IDUKKyAgICBEaWRGaXJzdFBhaW50 QWZ0ZXJTdXBwcmVzc2VkSW5jcmVtZW50YWxSZW5kZXJpbmcgPSAxIDw8IDUsCisgICAgUmVhY2hl ZFNlc3Npb25SZXN0b3JhdGlvblJlbmRlclRyZWVTaXplVGhyZXNob2xkID0gMSA8PCA2IC8vIEZJ WE1FOiBvbmx5IGltcGxlbWVudGVkIGJ5IFdLMiBjdXJyZW50bHkuCiB9OwogCiB0eXBlZGVmIHVu c2lnbmVkIExheW91dE1pbGVzdG9uZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvU2Vzc2lvblN0YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvU2Vzc2lvblN0YXRlLmgK aW5kZXggNjE0ZDQxOWY2MWZhMDFiY2QxNjcwNWM3YjUwM2FkM2ZhNWM2NjhhNi4uZDRkNmEyYmY0 MmI5OTk2NmRmNWNlODYwYWM1ZDc0Yjk4ZmU5YTQ2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvU2hhcmVkL1Nlc3Npb25TdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9TZXNz aW9uU3RhdGUuaApAQCAtMTQwLDYgKzE0MCw3IEBAIHN0cnVjdCBCYWNrRm9yd2FyZExpc3RTdGF0 ZSB7CiAKIHN0cnVjdCBTZXNzaW9uU3RhdGUgewogICAgIEJhY2tGb3J3YXJkTGlzdFN0YXRlIGJh Y2tGb3J3YXJkTGlzdFN0YXRlOworICAgIHVpbnQ2NF90IHJlbmRlclRyZWVTaXplOwogICAgIFdl YkNvcmU6OlVSTCBwcm92aXNpb25hbFVSTDsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggOGJmOTk4MDE3NWQ1MjBmODQ1YTgy ZmQ3MDc5OTIxNzVlNzIxNjVjMC4uMzIyNzkyYmE3YWUwOTAxYzcyNDM1NTJmMjkwYTBmMWRjYjA3 MTI2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXcubW0KQEAgLTE4MDIsNiArMTgwMiw5IEBAIHN0YXRpYyBpbmxpbmUgV2ViQ29yZTo6TGF5b3V0 TWlsZXN0b25lcyBsYXlvdXRNaWxlc3RvbmVzKF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZlCiAgICAg aWYgKGV2ZW50cyAmIF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZlbnRGaXJzdFBhaW50V2l0aFNpZ25p ZmljYW50QXJlYSkKICAgICAgICAgbWlsZXN0b25lcyB8PSBXZWJDb3JlOjpEaWRIaXRSZWxldmFu dFJlcGFpbnRlZE9iamVjdHNBcmVhVGhyZXNob2xkOwogCisgICAgaWYgKGV2ZW50cyAmIF9XS1Jl bmRlcmluZ1Byb2dyZXNzRXZlbnRSZWFjaGVkU2Vzc2lvblJlc3RvcmF0aW9uUmVuZGVyVHJlZVNp emVUaHJlc2hvbGQpCisgICAgICAgIG1pbGVzdG9uZXMgfD0gV2ViQ29yZTo6UmVhY2hlZFNlc3Np b25SZXN0b3JhdGlvblJlbmRlclRyZWVTaXplVGhyZXNob2xkOworCiAgICAgcmV0dXJuIG1pbGVz dG9uZXM7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3UHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXdQcml2YXRlLmgKaW5kZXggYTU0ZDE0M2JmYWM2MGFjNmVhZGQyMjllNTg1NDIy NmMxM2YyNWMzMS4uZDZjYmExNTJiZjJkNjUwZjRkMzE1OTcxYzZjYTBiZDk2MzM4NmEzNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2 YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQ cml2YXRlLmgKQEAgLTMwLDYgKzMwLDcgQEAKIHR5cGVkZWYgTlNfT1BUSU9OUyhOU1VJbnRlZ2Vy LCBfV0tSZW5kZXJpbmdQcm9ncmVzc0V2ZW50cykgewogICAgIF9XS1JlbmRlcmluZ1Byb2dyZXNz RXZlbnRGaXJzdExheW91dCA9IDEgPDwgMCwKICAgICBfV0tSZW5kZXJpbmdQcm9ncmVzc0V2ZW50 Rmlyc3RQYWludFdpdGhTaWduaWZpY2FudEFyZWEgPSAxIDw8IDIsCisgICAgX1dLUmVuZGVyaW5n UHJvZ3Jlc3NFdmVudFJlYWNoZWRTZXNzaW9uUmVzdG9yYXRpb25SZW5kZXJUcmVlU2l6ZVRocmVz aG9sZCBXS19FTlVNX0FWQUlMQUJMRShOQSwgV0tfSU9TX1RCQSkgPSAxIDw8IDMKIH0gV0tfRU5V TV9BVkFJTEFCTEUoMTBfMTAsIDhfMCk7CiAKIHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIF9X S1BhZ2luYXRpb25Nb2RlKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv Q29jb2EvTmF2aWdhdGlvblN0YXRlLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29h L05hdmlnYXRpb25TdGF0ZS5tbQppbmRleCA3OTQxZGJmNDA4MzQxMmE1ZTE4NmJjYWU0Y2ZkZDI2 NDM2YzIyYzFkLi41YTZiNzE0NTRmOGI1ZjdlZTQ2ZDMzOGMwNGYxYjVhNWI3ZTdmNzE3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0K QEAgLTY3Myw2ICs2NzMsOSBAQCBzdGF0aWMgX1dLUmVuZGVyaW5nUHJvZ3Jlc3NFdmVudHMgcmVu ZGVyaW5nUHJvZ3Jlc3NFdmVudHMoV2ViQ29yZTo6TGF5b3V0TWlsZXN0bwogICAgIGlmIChtaWxl c3RvbmVzICYgV2ViQ29yZTo6RGlkSGl0UmVsZXZhbnRSZXBhaW50ZWRPYmplY3RzQXJlYVRocmVz aG9sZCkKICAgICAgICAgZXZlbnRzIHw9IF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZlbnRGaXJzdFBh aW50V2l0aFNpZ25pZmljYW50QXJlYTsKIAorICAgIGlmIChtaWxlc3RvbmVzICYgV2ViQ29yZTo6 UmVhY2hlZFNlc3Npb25SZXN0b3JhdGlvblJlbmRlclRyZWVTaXplVGhyZXNob2xkKQorICAgICAg ICBldmVudHMgfD0gX1dLUmVuZGVyaW5nUHJvZ3Jlc3NFdmVudFJlYWNoZWRTZXNzaW9uUmVzdG9y YXRpb25SZW5kZXJUcmVlU2l6ZVRocmVzaG9sZDsKKwogICAgIHJldHVybiBldmVudHM7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMjNmM2JjNGRj ZmM5OTc2MjhhNWZhNTE4Yzg5NTc3YTQ5ZTk3OWJhMC4uMGVkY2YzYzdhMTI1NGUzOTA5NDY3MTVk N2I1ZGZjODc5NjgwOThkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKQEAgLTM1OSw2ICszNTksOSBAQCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShQYWdl Q2xpZW50JiBwYWdlQ2xpZW50LCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIHVpbgogICAgICwg bV9pc1Nob3dpbmdOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90KGZhbHNlKQogICAgICwgbV9wYWdl Q291bnQoMCkKICAgICAsIG1fcmVuZGVyVHJlZVNpemUoMCkKKyAgICAsIG1fc2Vzc2lvblJlc3Rv cmF0aW9uUmVuZGVyVHJlZVNpemUoMCkKKyAgICAsIG1fd2FudHNTZXNzaW9uUmVzdG9yYXRpb25S ZW5kZXJUcmVlU2l6ZVRocmVzaG9sZEV2ZW50KGZhbHNlKQorICAgICwgbV9oaXRSZW5kZXJUcmVl U2l6ZVRocmVzaG9sZChmYWxzZSkKICAgICAsIG1fc2hvdWxkU2VuZEV2ZW50c1N5bmNocm9ub3Vz bHkoZmFsc2UpCiAgICAgLCBtX3N1cHByZXNzVmlzaWJpbGl0eVVwZGF0ZXMoZmFsc2UpCiAgICAg LCBtX2F1dG9TaXppbmdTaG91bGRFeHBhbmRUb1ZpZXdIZWlnaHQoZmFsc2UpCkBAIC0xOTI5LDEx ICsxOTMyLDE1IEBAIFNlc3Npb25TdGF0ZSBXZWJQYWdlUHJveHk6OnNlc3Npb25TdGF0ZShjb25z dCBzdGQ6OmZ1bmN0aW9uPGJvb2wgKFdlYkJhY2tGb3J3YXJkCiAgICAgaWYgKCFwcm92aXNpb25h bFVSTFN0cmluZy5pc0VtcHR5KCkpCiAgICAgICAgIHNlc3Npb25TdGF0ZS5wcm92aXNpb25hbFVS TCA9IFVSTChVUkwoKSwgcHJvdmlzaW9uYWxVUkxTdHJpbmcpOwogCisgICAgc2Vzc2lvblN0YXRl LnJlbmRlclRyZWVTaXplID0gcmVuZGVyVHJlZVNpemUoKTsKICAgICByZXR1cm4gc2Vzc2lvblN0 YXRlOwogfQogCiB1aW50NjRfdCBXZWJQYWdlUHJveHk6OnJlc3RvcmVGcm9tU2Vzc2lvblN0YXRl KFNlc3Npb25TdGF0ZSBzZXNzaW9uU3RhdGUsIGJvb2wgbmF2aWdhdGUpCiB7CisgICAgbV9zZXNz aW9uUmVzdG9yYXRpb25SZW5kZXJUcmVlU2l6ZSA9IDA7CisgICAgbV9oaXRSZW5kZXJUcmVlU2l6 ZVRocmVzaG9sZCA9IGZhbHNlOworCiAgICAgYm9vbCBoYXNCYWNrRm9yd2FyZExpc3QgPSAhIXNl c3Npb25TdGF0ZS5iYWNrRm9yd2FyZExpc3RTdGF0ZS5jdXJyZW50SW5kZXg7CiAKICAgICBpZiAo aGFzQmFja0ZvcndhcmRMaXN0KSB7CkBAIC0xOTQ1LDggKzE5NTIsOSBAQCB1aW50NjRfdCBXZWJQ YWdlUHJveHk6OnJlc3RvcmVGcm9tU2Vzc2lvblN0YXRlKFNlc3Npb25TdGF0ZSBzZXNzaW9uU3Rh dGUsIGJvb2wgbgogICAgICAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUGFnZTo6UmVz dG9yZVNlc3Npb24obV9iYWNrRm9yd2FyZExpc3QtPml0ZW1TdGF0ZXMoKSksIG1fcGFnZUlEKTsK ICAgICB9CiAKKyAgICAvLyBGSVhNRTogTmF2aWdhdGluZyBzaG91bGQgYmUgc2VwYXJhdGUgZnJv bSBzdGF0ZSByZXN0b3JhdGlvbi4KICAgICBpZiAobmF2aWdhdGUpIHsKLSAgICAgICAgLy8gRklY TUU6IE5hdmlnYXRpbmcgc2hvdWxkIGJlIHNlcGFyYXRlIGZyb20gc3RhdGUgcmVzdG9yYXRpb24u CisgICAgICAgIG1fc2Vzc2lvblJlc3RvcmF0aW9uUmVuZGVyVHJlZVNpemUgPSBzZXNzaW9uU3Rh dGUucmVuZGVyVHJlZVNpemU7CiAKICAgICAgICAgaWYgKCFzZXNzaW9uU3RhdGUucHJvdmlzaW9u YWxVUkwuaXNOdWxsKCkpCiAgICAgICAgICAgICByZXR1cm4gbG9hZFJlcXVlc3Qoc2Vzc2lvblN0 YXRlLnByb3Zpc2lvbmFsVVJMKTsKQEAgLTIxMDUsNiArMjExMyw4IEBAIHZvaWQgV2ViUGFnZVBy b3h5OjpsaXN0ZW5Gb3JMYXlvdXRNaWxlc3RvbmVzKFdlYkNvcmU6OkxheW91dE1pbGVzdG9uZXMg bWlsZXN0b25lCiB7CiAgICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKKyAgICAK KyAgICBtX3dhbnRzU2Vzc2lvblJlc3RvcmF0aW9uUmVuZGVyVHJlZVNpemVUaHJlc2hvbGRFdmVu dCA9IG1pbGVzdG9uZXMgJiBXZWJDb3JlOjpSZWFjaGVkU2Vzc2lvblJlc3RvcmF0aW9uUmVuZGVy VHJlZVNpemVUaHJlc2hvbGQ7CiAKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6Okxpc3RlbkZvckxheW91dE1pbGVzdG9uZXMobWlsZXN0b25lcyksIG1fcGFnZUlEKTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBjYjI0ZDc4ZGY5Nzk4 OTk2MGE0NDQ1ZjZhZTEyZjA0ZGFiMzZlZGZiLi5iMzZiMjRmMjdkZmNiNTk4YzQ5ZDM0YjdmMzdj ZTZmN2M5OTUxODYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBA IC0xNTUwLDYgKzE1NTAsOSBAQCBwcml2YXRlOgogICAgIFdlYkNvcmU6OkludFJlY3QgbV92aXNp YmxlU2Nyb2xsZXJUaHVtYlJlY3Q7CiAKICAgICB1aW50NjRfdCBtX3JlbmRlclRyZWVTaXplOwor ICAgIHVpbnQ2NF90IG1fc2Vzc2lvblJlc3RvcmF0aW9uUmVuZGVyVHJlZVNpemU7CisgICAgYm9v bCBtX3dhbnRzU2Vzc2lvblJlc3RvcmF0aW9uUmVuZGVyVHJlZVNpemVUaHJlc2hvbGRFdmVudDsK KyAgICBib29sIG1faGl0UmVuZGVyVHJlZVNpemVUaHJlc2hvbGQ7CiAKICAgICBib29sIG1fc2hv dWxkU2VuZEV2ZW50c1N5bmNocm9ub3VzbHk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0KaW5kZXggZTAxZjhhYzc5Y2E2YmViZDgyZWI0NzU5 YjUyNmVhYWIyMmY2YjQzOS4uNTkzNmRhZmE3MTNiYWFmZjllNGFhYjEzOWQxZTI0OTQxZjU4MmQy YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJ T1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1Mu bW0KQEAgLTMzMiw2ICszMzIsMTIgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNldERldmljZU9yaWVu dGF0aW9uKGludDMyX3QgZGV2aWNlT3JpZW50YXRpb24pCiAgICAgfQogfQogCitzdGF0aWMgYm9v bCBleGNlZWRzUmVuZGVyVHJlZVNpemVTaXplVGhyZXNob2xkKHVpbnQ2NF90IHRocmVzaG9sZFNp emUsIHVpbnQ2NF90IGNvbW1pdHRlZFNpemUpCit7CisgICAgY29uc3QgZG91YmxlIHRoZXNob2xk U2l6ZUZyYWN0aW9uID0gMC41OyAvLyBFbXBpcmljYWxseS1kZXJpdmVkLgorICAgIHJldHVybiBj b21taXR0ZWRTaXplID4gdGhyZXNob2xkU2l6ZSAqIHRoZXNob2xkU2l6ZUZyYWN0aW9uOworfQor CiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ29tbWl0TGF5ZXJUcmVlKGNvbnN0IFdlYktpdDo6UmVt b3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24mIGxheWVyVHJlZVRyYW5zYWN0aW9uKQogewogICAgIG1f cGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yID0gbGF5ZXJUcmVlVHJhbnNhY3Rpb24ucGFnZUV4 dGVuZGVkQmFja2dyb3VuZENvbG9yKCk7CkBAIC0zNDksNiArMzU1LDEyIEBAIHZvaWQgV2ViUGFn ZVByb3h5OjpkaWRDb21taXRMYXllclRyZWUoY29uc3QgV2ViS2l0OjpSZW1vdGVMYXllclRyZWVU cmFuc2FjdGlvbiYKICAgICB9CiAKICAgICBtX3BhZ2VDbGllbnQuZGlkQ29tbWl0TGF5ZXJUcmVl KGxheWVyVHJlZVRyYW5zYWN0aW9uKTsKKworICAgIGlmIChtX3dhbnRzU2Vzc2lvblJlc3RvcmF0 aW9uUmVuZGVyVHJlZVNpemVUaHJlc2hvbGRFdmVudCAmJiAhbV9oaXRSZW5kZXJUcmVlU2l6ZVRo cmVzaG9sZAorICAgICAgICAmJiBleGNlZWRzUmVuZGVyVHJlZVNpemVTaXplVGhyZXNob2xkKG1f c2Vzc2lvblJlc3RvcmF0aW9uUmVuZGVyVHJlZVNpemUsIGxheWVyVHJlZVRyYW5zYWN0aW9uLnJl bmRlclRyZWVTaXplKCkpKSB7CisgICAgICAgIG1faGl0UmVuZGVyVHJlZVNpemVUaHJlc2hvbGQg PSB0cnVlOworICAgICAgICBtX2xvYWRlckNsaWVudC0+ZGlkTGF5b3V0KHRoaXMsIFdlYkNvcmU6 OlJlYWNoZWRTZXNzaW9uUmVzdG9yYXRpb25SZW5kZXJUcmVlU2l6ZVRocmVzaG9sZCwgbnVsbHB0 cik7CisgICAgfQogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2VsZWN0V2l0aEdlc3R1cmUoY29u c3QgV2ViQ29yZTo6SW50UG9pbnQgcG9pbnQsIFdlYkNvcmU6OlRleHRHcmFudWxhcml0eSBncmFu dWxhcml0eSwgdWludDMyX3QgZ2VzdHVyZVR5cGUsIHVpbnQzMl90IGdlc3R1cmVTdGF0ZSwgc3Rk OjpmdW5jdGlvbjx2b2lkIChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYsIHVpbnQzMl90LCB1aW50 MzJfdCwgdWludDMyX3QsIENhbGxiYWNrQmFzZTo6RXJyb3IpPiBjYWxsYmFja0Z1bmN0aW9uKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3Rh dGVDb2RpbmcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9u U3RhdGVDb2RpbmcuY3BwCmluZGV4IDdkYzY4OTg5YWM3NDllNGVhNmIzNThlNjI4NTA4MWUxNGVh NjY5MTkuLjQwMmY0MGU3OWM2NzcwZGE0OWM5Yjg5MmZlNDFiYTczNDYxOGMwZjEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lvblN0YXRlQ29kaW5n LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL0xlZ2FjeVNlc3Npb25TdGF0 ZUNvZGluZy5jcHAKQEAgLTM2LDEwICszNiwxNSBAQAogbmFtZXNwYWNlIFdlYktpdCB7CiAKIC8v IFNlc3Npb24gc3RhdGUga2V5cy4KKyNpZiBQTEFURk9STShJT1MpCitzdGF0aWMgY29uc3QgdWlu dDMyX3Qgc2Vzc2lvblN0YXRlRGF0YVZlcnNpb24gPSAzOworI2Vsc2UKIHN0YXRpYyBjb25zdCB1 aW50MzJfdCBzZXNzaW9uU3RhdGVEYXRhVmVyc2lvbiA9IDI7CisjZW5kaWYKIAogc3RhdGljIGNv bnN0IENGU3RyaW5nUmVmIHNlc3Npb25IaXN0b3J5S2V5ID0gQ0ZTVFIoIlNlc3Npb25IaXN0b3J5 Iik7CiBzdGF0aWMgY29uc3QgQ0ZTdHJpbmdSZWYgcHJvdmlzaW9uYWxVUkxLZXkgPSBDRlNUUigi UHJvdmlzaW9uYWxVUkwiKTsKK3N0YXRpYyBjb25zdCBDRlN0cmluZ1JlZiByZW5kZXJUcmVlU2l6 ZUtleSA9IENGU1RSKCJSZW5kZXJUcmVlU2l6ZSIpOwogCiAvLyBTZXNzaW9uIGhpc3Rvcnkga2V5 cy4KIHN0YXRpYyBjb25zdCB1aW50MzJfdCBzZXNzaW9uSGlzdG9yeVZlcnNpb24gPSAxOwpAQCAt NTAsOSArNTUsOSBAQCBzdGF0aWMgY29uc3QgQ0ZTdHJpbmdSZWYgc2Vzc2lvbkhpc3RvcnlFbnRy aWVzS2V5ID0gQ0ZTVFIoIlNlc3Npb25IaXN0b3J5RW50cmllcwogCiAvLyBTZXNzaW9uIGhpc3Rv cnkgZW50cnkga2V5cy4KIHN0YXRpYyBjb25zdCBDRlN0cmluZ1JlZiBzZXNzaW9uSGlzdG9yeUVu dHJ5VVJMS2V5ID0gQ0ZTVFIoIlNlc3Npb25IaXN0b3J5RW50cnlVUkwiKTsKLXN0YXRpYyBDRlN0 cmluZ1JlZiBzZXNzaW9uSGlzdG9yeUVudHJ5VGl0bGVLZXkgPSBDRlNUUigiU2Vzc2lvbkhpc3Rv cnlFbnRyeVRpdGxlIik7Ci1zdGF0aWMgQ0ZTdHJpbmdSZWYgc2Vzc2lvbkhpc3RvcnlFbnRyeU9y aWdpbmFsVVJMS2V5ID0gQ0ZTVFIoIlNlc3Npb25IaXN0b3J5RW50cnlPcmlnaW5hbFVSTCIpOwot c3RhdGljIENGU3RyaW5nUmVmIHNlc3Npb25IaXN0b3J5RW50cnlEYXRhS2V5ID0gQ0ZTVFIoIlNl c3Npb25IaXN0b3J5RW50cnlEYXRhIik7CitzdGF0aWMgY29uc3QgQ0ZTdHJpbmdSZWYgc2Vzc2lv bkhpc3RvcnlFbnRyeVRpdGxlS2V5ID0gQ0ZTVFIoIlNlc3Npb25IaXN0b3J5RW50cnlUaXRsZSIp Oworc3RhdGljIGNvbnN0IENGU3RyaW5nUmVmIHNlc3Npb25IaXN0b3J5RW50cnlPcmlnaW5hbFVS TEtleSA9IENGU1RSKCJTZXNzaW9uSGlzdG9yeUVudHJ5T3JpZ2luYWxVUkwiKTsKK3N0YXRpYyBj b25zdCBDRlN0cmluZ1JlZiBzZXNzaW9uSGlzdG9yeUVudHJ5RGF0YUtleSA9IENGU1RSKCJTZXNz aW9uSGlzdG9yeUVudHJ5RGF0YSIpOwogCiAvLyBTZXNzaW9uIGhpc3RvcnkgZW50cnkgZGF0YS4K IGNvbnN0IHVpbnQzMl90IHNlc3Npb25IaXN0b3J5RW50cnlEYXRhVmVyc2lvbiA9IDI7CkBAIC00 MjYsNyArNDMxLDEyIEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPiBlbmNvZGVT ZXNzaW9uSGlzdG9yeShjb25zdCBCYWNrRm9yd2FyZExpc3RTdGF0CiAgICAgICAgIGF1dG8gb3Jp Z2luYWxVUkwgPSBpdGVtLnBhZ2VTdGF0ZS5tYWluRnJhbWVTdGF0ZS5vcmlnaW5hbFVSTFN0cmlu Zy5jcmVhdGVDRlN0cmluZygpOwogICAgICAgICBhdXRvIGRhdGEgPSBlbmNvZGVTZXNzaW9uSGlz dG9yeUVudHJ5RGF0YShpdGVtLnBhZ2VTdGF0ZS5tYWluRnJhbWVTdGF0ZSk7CiAKLSAgICAgICAg YXV0byBlbnRyeURpY3Rpb25hcnkgPSBjcmVhdGVEaWN0aW9uYXJ5KHsgeyBzZXNzaW9uSGlzdG9y eUVudHJ5VVJMS2V5LCB1cmwuZ2V0KCkgfSwgeyBzZXNzaW9uSGlzdG9yeUVudHJ5VGl0bGVLZXks IHRpdGxlLmdldCgpIH0sIHsgc2Vzc2lvbkhpc3RvcnlFbnRyeU9yaWdpbmFsVVJMS2V5LCBvcmln aW5hbFVSTC5nZXQoKSB9LCB7IHNlc3Npb25IaXN0b3J5RW50cnlEYXRhS2V5LCBkYXRhLmdldCgp IH0gfSk7CisgICAgICAgIGF1dG8gZW50cnlEaWN0aW9uYXJ5ID0gY3JlYXRlRGljdGlvbmFyeSh7 CisgICAgICAgICAgICB7IHNlc3Npb25IaXN0b3J5RW50cnlVUkxLZXksIHVybC5nZXQoKSB9LAor ICAgICAgICAgICAgeyBzZXNzaW9uSGlzdG9yeUVudHJ5VGl0bGVLZXksIHRpdGxlLmdldCgpIH0s CisgICAgICAgICAgICB7IHNlc3Npb25IaXN0b3J5RW50cnlPcmlnaW5hbFVSTEtleSwgb3JpZ2lu YWxVUkwuZ2V0KCkgfSwKKyAgICAgICAgICAgIHsgc2Vzc2lvbkhpc3RvcnlFbnRyeURhdGFLZXks IGRhdGEuZ2V0KCkgfSwKKyAgICAgICAgfSk7CiAKICAgICAgICAgQ0ZBcnJheUFwcGVuZFZhbHVl KGVudHJpZXMuZ2V0KCksIGVudHJ5RGljdGlvbmFyeS5nZXQoKSk7CiAgICAgfQpAQCAtNDQyLDEx ICs0NTIsMjcgQEAgUmVmUHRyPEFQSTo6RGF0YT4gZW5jb2RlTGVnYWN5U2Vzc2lvblN0YXRlKGNv bnN0IFNlc3Npb25TdGF0ZSYgc2Vzc2lvblN0YXRlKQogICAgIGF1dG8gc2Vzc2lvbkhpc3RvcnlE aWN0aW9uYXJ5ID0gZW5jb2RlU2Vzc2lvbkhpc3Rvcnkoc2Vzc2lvblN0YXRlLmJhY2tGb3J3YXJk TGlzdFN0YXRlKTsKICAgICBhdXRvIHByb3Zpc2lvbmFsVVJMU3RyaW5nID0gc2Vzc2lvblN0YXRl LnByb3Zpc2lvbmFsVVJMLmlzTnVsbCgpID8gbnVsbHB0ciA6IHNlc3Npb25TdGF0ZS5wcm92aXNp b25hbFVSTC5zdHJpbmcoKS5jcmVhdGVDRlN0cmluZygpOwogCisjaWYgUExBVEZPUk0oSU9TKQor ICAgIFJldGFpblB0cjxDRk51bWJlclJlZj4gcmVuZGVyVHJlZVNpemVOdW1iZXIoYWRvcHRDRihD Rk51bWJlckNyZWF0ZShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBrQ0ZOdW1iZXJTSW50NjRUeXBlLCAm c2Vzc2lvblN0YXRlLnJlbmRlclRyZWVTaXplKSkpOworI2VuZGlmCisKICAgICBSZXRhaW5QdHI8 Q0ZEaWN0aW9uYXJ5UmVmPiBzdGF0ZURpY3Rpb25hcnk7Ci0gICAgaWYgKHByb3Zpc2lvbmFsVVJM U3RyaW5nKQotICAgICAgICBzdGF0ZURpY3Rpb25hcnkgPSBjcmVhdGVEaWN0aW9uYXJ5KHsgeyBz ZXNzaW9uSGlzdG9yeUtleSwgc2Vzc2lvbkhpc3RvcnlEaWN0aW9uYXJ5LmdldCgpIH0sIHsgcHJv dmlzaW9uYWxVUkxLZXksIHByb3Zpc2lvbmFsVVJMU3RyaW5nLmdldCgpIH0gfSk7Ci0gICAgZWxz ZQotICAgICAgICBzdGF0ZURpY3Rpb25hcnkgPSBjcmVhdGVEaWN0aW9uYXJ5KHsgeyBzZXNzaW9u SGlzdG9yeUtleSwgc2Vzc2lvbkhpc3RvcnlEaWN0aW9uYXJ5LmdldCgpIH0gfSk7CisgICAgaWYg KHByb3Zpc2lvbmFsVVJMU3RyaW5nKSB7CisgICAgICAgIHN0YXRlRGljdGlvbmFyeSA9IGNyZWF0 ZURpY3Rpb25hcnkoeworICAgICAgICAgICAgeyBzZXNzaW9uSGlzdG9yeUtleSwgc2Vzc2lvbkhp c3RvcnlEaWN0aW9uYXJ5LmdldCgpIH0sCisgICAgICAgICAgICB7IHByb3Zpc2lvbmFsVVJMS2V5 LCBwcm92aXNpb25hbFVSTFN0cmluZy5nZXQoKSB9LAorI2lmIFBMQVRGT1JNKElPUykKKyAgICAg ICAgICAgIHsgcmVuZGVyVHJlZVNpemVLZXksIHJlbmRlclRyZWVTaXplTnVtYmVyLmdldCgpIH0K KyNlbmRpZgorICAgICAgICB9KTsKKyAgICB9IGVsc2UgeworICAgICAgICBzdGF0ZURpY3Rpb25h cnkgPSBjcmVhdGVEaWN0aW9uYXJ5KHsKKyAgICAgICAgICAgIHsgc2Vzc2lvbkhpc3RvcnlLZXks IHNlc3Npb25IaXN0b3J5RGljdGlvbmFyeS5nZXQoKSB9LAorI2lmIFBMQVRGT1JNKElPUykKKyAg ICAgICAgICAgIHsgcmVuZGVyVHJlZVNpemVLZXksIHJlbmRlclRyZWVTaXplTnVtYmVyLmdldCgp IH0KKyNlbmRpZgorICAgICAgICB9KTsKKyAgICB9CiAKICAgICBhdXRvIHdyaXRlU3RyZWFtID0g YWRvcHRDRihDRldyaXRlU3RyZWFtQ3JlYXRlV2l0aEFsbG9jYXRlZEJ1ZmZlcnMoa0NGQWxsb2Nh dG9yRGVmYXVsdCwgbnVsbHB0cikpOwogICAgIGlmICghd3JpdGVTdHJlYW0pCkBAIC05MDIsOCAr OTI4LDggQEAgc3RhdGljIHZvaWQgZGVjb2RlQmFja0ZvcndhcmRUcmVlTm9kZShIaXN0b3J5RW50 cnlEYXRhRGVjb2RlciYgZGVjb2RlciwgRnJhbWVTdGEKIAogICAgIGRlY29kZXIgPj4gZnJhbWVT dGF0ZS50YXJnZXQ7CiAKLSAgICAvLyBGSVhNRTogaU9TIHNob3VsZCBub3QgdXNlIHRoZSBsZWdh Y3kgc2Vzc2lvbiBzdGF0ZSBkZWNvZGVyLgogI2lmIFBMQVRGT1JNKElPUykKKyAgICAvLyBGSVhN RTogaU9TIHNob3VsZCBub3QgdXNlIHRoZSBsZWdhY3kgc2Vzc2lvbiBzdGF0ZSBkZWNvZGVyLgog ICAgIGRlY29kZXIgPj4gZnJhbWVTdGF0ZS5leHBvc2VkQ29udGVudFJlY3Q7CiAgICAgZGVjb2Rl ciA+PiBmcmFtZVN0YXRlLnVub2JzY3VyZWRDb250ZW50UmVjdDsKICAgICBkZWNvZGVyID4+IGZy YW1lU3RhdGUubWluaW11bUxheW91dFNpemVJblNjcm9sbFZpZXdDb29yZGluYXRlczsKQEAgLTEw ODcsNiArMTExMywxMSBAQCBib29sIGRlY29kZUxlZ2FjeVNlc3Npb25TdGF0ZShjb25zdCB1aW50 OF90KiBieXRlcywgc2l6ZV90IHNpemUsIFNlc3Npb25TdGF0ZSYgcwogICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIH0KIAorI2lmIFBMQVRGT1JNKElPUykKKyAgICBpZiAoYXV0byByZW5k ZXJUcmVlU2l6ZSA9IGR5bmFtaWNfY2ZfY2FzdDxDRk51bWJlclJlZj4oQ0ZEaWN0aW9uYXJ5R2V0 VmFsdWUoc2Vzc2lvblN0YXRlRGljdGlvbmFyeS5nZXQoKSwgcmVuZGVyVHJlZVNpemVLZXkpKSkK KyAgICAgICAgQ0ZOdW1iZXJHZXRWYWx1ZShyZW5kZXJUcmVlU2l6ZSwga0NGTnVtYmVyU0ludDY0 VHlwZSwgJnNlc3Npb25TdGF0ZS5yZW5kZXJUcmVlU2l6ZSk7CisjZW5kaWYKKwogICAgIHJldHVy biB0cnVlOwogfQogCg== 241508 2014-11-13 14:54:38 -0800 2014-11-13 15:01:53 -0800 Patch bug-138711-20141113145444.patch text/plain 16552 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1ODI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODJlNTA4NDY3N2VkM2Jm YThiZjJkNDkwYWU3OWQ5ZTExODIyNmQ5Zi4uNDc1OTE3MmI5MTRmYjQ0N2Y1MzhkODczYzA5Njlk MjYxNjNiNTk1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTExLTEzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgV2syXSBG aXJlIGEgbGF5b3V0IG1pbGVzdG9uZSBvbiBzZXNzaW9uIHJlc3RvcmUgYmFzZWQgb24gcmVuZGVy IHRyZWUgc2l6ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTM4NzExCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzE2MDMzODU0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmV3IGxheW91dCBtaWxlc3RvbmUg Zm9yIHNlc3Npb24gcmVzdG9yZSBiYXNlZCBvbiByZW5kZXIgdHJlZSBzaXplLiBPbmx5IHVzZWQK KyAgICAgICAgaW4gV0syIGF0IHByZXNlbnQuCisKKyAgICAgICAgKiBwYWdlL0xheW91dE1pbGVz dG9uZXMuaDoKKwogMjAxNC0xMS0wNCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4K IAogICAgICAgICBSRUdSRVNTSU9OKHIxNzQ4MjMpOiBTZXZlcmFsIHRlc3RzIGZhaWwgZHVlIHRv IGNhbnBsYXl0aHJvdWdoIGZpcmluZyBiZWZvcmUgdHJhY2tzIGFyZSBhdmFpbGFibGUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZwppbmRleCAwN2E1MjQyYzJlMTllOTAyNmU3ZTJiYWYwMDM1YjYxZjNmNWU2YWE2Li41NWY0YmIx ZmY0NTM5YjQxMjZhMjYxYzkwZDU2MDEyNjQ5YzdiMzE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MzkgQEAKKzIwMTQtMTEtMTMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+ CisKKyAgICAgICAgW2lPUyBXazJdIEZpcmUgYSBsYXlvdXQgbWlsZXN0b25lIG9uIHNlc3Npb24g cmVzdG9yZSBiYXNlZCBvbiByZW5kZXIgdHJlZSBzaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg3MTEKKyAgICAgICAgcmRhcjovL3Byb2JsZW0v MTYwMzM4NTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAg CisgICAgICAgIEFkZCBhIHNlc3Npb24tcmVzdG9yZSBsYXlvdXQgbWlsZXN0b25lIHdoaWNoIGZp cmVzIGFmdGVyIHJlc3RvcmluZyBhIHNlc3Npb24sCisgICAgICAgIHdoZW4gdGhlIHJlbmRlciB0 cmVlIHNpemUgcmVhY2hlcyA1MCUgb2YgdGhlIHNpemUgc2F2ZWQgaW4gdGhlIHNlc3Npb24gc3Rh dGUuCisKKyAgICAgICAgKiBTaGFyZWQvU2Vzc2lvblN0YXRlLmg6IEFkZCByZW5kZXJUcmVlU2l6 ZS4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAg KGxheW91dE1pbGVzdG9uZXMpOiBUcmFuc2xhdGUgZnJvbSBTUEkgdG8gV2ViQ29yZSBtaWxlc3Rv bmVzLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oOiBO ZXcgaU9TLW9ubHkgbWlsZXN0b25lLCBlciwgZXZlbnQuCisgICAgICAgICogVUlQcm9jZXNzL0Nv Y29hL05hdmlnYXRpb25TdGF0ZS5tbToKKyAgICAgICAgKFdlYktpdDo6cmVuZGVyaW5nUHJvZ3Jl c3NFdmVudHMpOiBUcmFuc2xhdGUgZnJvbSBXZWJDb3JlIG1pbGVzdG9uZSB0byByZW5kZXJpbmcg ZXZlbnQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6V2ViUGFnZVByb3h5KTogSW5pdCBzdHVmZi4KKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpzZXNzaW9uU3RhdGUpOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OnJlc3RvcmVGcm9tU2Vzc2lvblN0YXRlKTogWmVybyBvdXQgdGhlIHRhcmdl dCByZW5kZXIgdHJlZSBzaXplLAorICAgICAgICB0aGVuIGdldCBpdCBvdXQgb2Ygc2Vzc2lvbiBz dGF0ZSBhbmQgc2V0IHRoZSBmbGFnIHRvIHNheSB0aGF0IHdlIGhhdmVuJ3QgcmVhY2hlZCBpdCB5 ZXQuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bGlzdGVuRm9yTGF5b3V0TWlsZXN0 b25lcyk6IFNldCBhIGZsYWcgdG8ga25vdyB0aGF0IHdlIHNob3VsZCBmaXJlCisgICAgICAgIHRo ZSBtaWxlc3RvbmUuIFRoZSBvdGhlciBtaWxlc3RvbmVzIGdldCBzZW50IGRpcmVjdGx5IHRvIFdl YkNvcmUuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpleGNlZWRz UmVuZGVyVHJlZVNpemVTaXplVGhyZXNob2xkKTogUmV0dXJuIHRydWUgd2hlbiB3ZSd2ZSByZWFj aGVkIDUwJS4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRDb21taXRMYXllclRy ZWUpOiBGaXJlIHRoZSBtaWxlc3RvbmUgd2hlbiBhcHByb3ByaWF0ZS4KKyAgICAgICAgKiBVSVBy b2Nlc3MvbWFjL0xlZ2FjeVNlc3Npb25TdGF0ZUNvZGluZy5jcHA6IFJldiB0aGUgc2Vzc2lvbiBz dGF0ZSBkYXRhIGZvciBpT1MKKyAgICAgICAgKHdoZXJlIGRvaW5nIHNvIGlzIGxlc3MgZGlzcnVw dGl2ZSkuIFN0YW5kYXJkaXplIHNvbWUgQ0ZTdHJpbmcgY29uc3RhbnRzLgorICAgICAgICAoV2Vi S2l0OjplbmNvZGVTZXNzaW9uSGlzdG9yeSk6IFdyYXAgZm9yIGxlZ2liaWxpdHkuCisgICAgICAg IChXZWJLaXQ6OmVuY29kZUxlZ2FjeVNlc3Npb25TdGF0ZSk6IE1ha2UgYSBDRk51bWJlciBmb3Ig cmVuZGVyIHRyZWUgc2l6ZSwgYW5kIHN0b3JlCisgICAgICAgIGl0IGluIHRoZSByb290IGRpY3Rp b25hcnkuCisgICAgICAgIChXZWJLaXQ6OmRlY29kZUJhY2tGb3J3YXJkVHJlZU5vZGUpOiBNb3Zl IGEgY29tbWVudCB0byBtYXRjaCBhbm90aGVyIHNpbWlsYXIgYmxvY2suCisgICAgICAgIChXZWJL aXQ6OmRlY29kZUxlZ2FjeVNlc3Npb25TdGF0ZSk6IERlY29kZSByZW5kZXIgdHJlZSBzaXplIGFu ZCBzdG9yZSBpdC4KKwogMjAxNC0xMS0xMCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw cGxlLmNvbT4KIAogICAgICAgICBbaU9TIFdLMl0gU2Nyb2xsIGRlY2VsZXJhdGlvbiByYXRlIGlz IHdyb25nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0xheW91dE1pbGVzdG9uZXMu aCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTGF5b3V0TWlsZXN0b25lcy5oCmluZGV4IDcwMDc0MzRi ZjVmYTFhYzdiNGYzOGEwMDFiOWVlYjY0MTU2ZTgxOGQuLmIxMjViYzRlYTc1NzFkY2M4N2IyYzJl MzgzMTFhNDcwYzM1MTdlNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTGF5b3V0 TWlsZXN0b25lcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTGF5b3V0TWlsZXN0b25lcy5o CkBAIC0zNyw3ICszNyw4IEBAIGVudW0gTGF5b3V0TWlsZXN0b25lRmxhZyB7CiAgICAgRGlkSGl0 UmVsZXZhbnRSZXBhaW50ZWRPYmplY3RzQXJlYVRocmVzaG9sZCA9IDEgPDwgMiwKICAgICBEaWRG aXJzdEZsdXNoRm9ySGVhZGVyTGF5ZXIgPSAxIDw8IDMsCiAgICAgRGlkRmlyc3RMYXlvdXRBZnRl clN1cHByZXNzZWRJbmNyZW1lbnRhbFJlbmRlcmluZyA9IDEgPDwgNCwKLSAgICBEaWRGaXJzdFBh aW50QWZ0ZXJTdXBwcmVzc2VkSW5jcmVtZW50YWxSZW5kZXJpbmcgPSAxIDw8IDUKKyAgICBEaWRG aXJzdFBhaW50QWZ0ZXJTdXBwcmVzc2VkSW5jcmVtZW50YWxSZW5kZXJpbmcgPSAxIDw8IDUsCisg ICAgUmVhY2hlZFNlc3Npb25SZXN0b3JhdGlvblJlbmRlclRyZWVTaXplVGhyZXNob2xkID0gMSA8 PCA2IC8vIEZJWE1FOiBvbmx5IGltcGxlbWVudGVkIGJ5IFdLMiBjdXJyZW50bHkuCiB9OwogCiB0 eXBlZGVmIHVuc2lnbmVkIExheW91dE1pbGVzdG9uZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvU2Vzc2lvblN0YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvU2Vzc2lv blN0YXRlLmgKaW5kZXggNjE0ZDQxOWY2MWZhMDFiY2QxNjcwNWM3YjUwM2FkM2ZhNWM2NjhhNi4u ZDRkNmEyYmY0MmI5OTk2NmRmNWNlODYwYWM1ZDc0Yjk4ZmU5YTQ2ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvU2hhcmVkL1Nlc3Npb25TdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9TZXNzaW9uU3RhdGUuaApAQCAtMTQwLDYgKzE0MCw3IEBAIHN0cnVjdCBCYWNrRm9yd2Fy ZExpc3RTdGF0ZSB7CiAKIHN0cnVjdCBTZXNzaW9uU3RhdGUgewogICAgIEJhY2tGb3J3YXJkTGlz dFN0YXRlIGJhY2tGb3J3YXJkTGlzdFN0YXRlOworICAgIHVpbnQ2NF90IHJlbmRlclRyZWVTaXpl OwogICAgIFdlYkNvcmU6OlVSTCBwcm92aXNpb25hbFVSTDsKIH07CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggOGJmOTk4MDE3NWQ1 MjBmODQ1YTgyZmQ3MDc5OTIxNzVlNzIxNjVjMC4uMzIyNzkyYmE3YWUwOTAxYzcyNDM1NTJmMjkw YTBmMWRjYjA3MTI2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXcubW0KQEAgLTE4MDIsNiArMTgwMiw5IEBAIHN0YXRpYyBpbmxpbmUgV2ViQ29y ZTo6TGF5b3V0TWlsZXN0b25lcyBsYXlvdXRNaWxlc3RvbmVzKF9XS1JlbmRlcmluZ1Byb2dyZXNz RXZlCiAgICAgaWYgKGV2ZW50cyAmIF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZlbnRGaXJzdFBhaW50 V2l0aFNpZ25pZmljYW50QXJlYSkKICAgICAgICAgbWlsZXN0b25lcyB8PSBXZWJDb3JlOjpEaWRI aXRSZWxldmFudFJlcGFpbnRlZE9iamVjdHNBcmVhVGhyZXNob2xkOwogCisgICAgaWYgKGV2ZW50 cyAmIF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZlbnRSZWFjaGVkU2Vzc2lvblJlc3RvcmF0aW9uUmVu ZGVyVHJlZVNpemVUaHJlc2hvbGQpCisgICAgICAgIG1pbGVzdG9uZXMgfD0gV2ViQ29yZTo6UmVh Y2hlZFNlc3Npb25SZXN0b3JhdGlvblJlbmRlclRyZWVTaXplVGhyZXNob2xkOworCiAgICAgcmV0 dXJuIG1pbGVzdG9uZXM7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKaW5kZXggYTU0ZDE0M2JmYWM2MGFjNmVhZGQy MjllNTg1NDIyNmMxM2YyNWMzMS4uZDZjYmExNTJiZjJkNjUwZjRkMzE1OTcxYzZjYTBiZDk2MzM4 NmEzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXdQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXdQcml2YXRlLmgKQEAgLTMwLDYgKzMwLDcgQEAKIHR5cGVkZWYgTlNfT1BUSU9OUyhO U1VJbnRlZ2VyLCBfV0tSZW5kZXJpbmdQcm9ncmVzc0V2ZW50cykgewogICAgIF9XS1JlbmRlcmlu Z1Byb2dyZXNzRXZlbnRGaXJzdExheW91dCA9IDEgPDwgMCwKICAgICBfV0tSZW5kZXJpbmdQcm9n cmVzc0V2ZW50Rmlyc3RQYWludFdpdGhTaWduaWZpY2FudEFyZWEgPSAxIDw8IDIsCisgICAgX1dL UmVuZGVyaW5nUHJvZ3Jlc3NFdmVudFJlYWNoZWRTZXNzaW9uUmVzdG9yYXRpb25SZW5kZXJUcmVl U2l6ZVRocmVzaG9sZCBXS19FTlVNX0FWQUlMQUJMRShOQSwgV0tfSU9TX1RCQSkgPSAxIDw8IDMK IH0gV0tfRU5VTV9BVkFJTEFCTEUoMTBfMTAsIDhfMCk7CiAKIHR5cGVkZWYgTlNfRU5VTShOU0lu dGVnZXIsIF9XS1BhZ2luYXRpb25Nb2RlKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQppbmRleCA3OTQxZGJmNDA4MzQxMmE1ZTE4NmJj YWU0Y2ZkZDI2NDM2YzIyYzFkLi41YTZiNzE0NTRmOGI1ZjdlZTQ2ZDMzOGMwNGYxYjVhNWI3ZTdm NzE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlv blN0YXRlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9u U3RhdGUubW0KQEAgLTY3Myw2ICs2NzMsOSBAQCBzdGF0aWMgX1dLUmVuZGVyaW5nUHJvZ3Jlc3NF dmVudHMgcmVuZGVyaW5nUHJvZ3Jlc3NFdmVudHMoV2ViQ29yZTo6TGF5b3V0TWlsZXN0bwogICAg IGlmIChtaWxlc3RvbmVzICYgV2ViQ29yZTo6RGlkSGl0UmVsZXZhbnRSZXBhaW50ZWRPYmplY3Rz QXJlYVRocmVzaG9sZCkKICAgICAgICAgZXZlbnRzIHw9IF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZl bnRGaXJzdFBhaW50V2l0aFNpZ25pZmljYW50QXJlYTsKIAorICAgIGlmIChtaWxlc3RvbmVzICYg V2ViQ29yZTo6UmVhY2hlZFNlc3Npb25SZXN0b3JhdGlvblJlbmRlclRyZWVTaXplVGhyZXNob2xk KQorICAgICAgICBldmVudHMgfD0gX1dLUmVuZGVyaW5nUHJvZ3Jlc3NFdmVudFJlYWNoZWRTZXNz aW9uUmVzdG9yYXRpb25SZW5kZXJUcmVlU2l6ZVRocmVzaG9sZDsKKwogICAgIHJldHVybiBldmVu dHM7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXgg MjNmM2JjNGRjZmM5OTc2MjhhNWZhNTE4Yzg5NTc3YTQ5ZTk3OWJhMC4uMGVkY2YzYzdhMTI1NGUz OTA5NDY3MTVkN2I1ZGZjODc5NjgwOThkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAKQEAgLTM1OSw2ICszNTksOSBAQCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQ cm94eShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIHVp bgogICAgICwgbV9pc1Nob3dpbmdOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90KGZhbHNlKQogICAg ICwgbV9wYWdlQ291bnQoMCkKICAgICAsIG1fcmVuZGVyVHJlZVNpemUoMCkKKyAgICAsIG1fc2Vz c2lvblJlc3RvcmF0aW9uUmVuZGVyVHJlZVNpemUoMCkKKyAgICAsIG1fd2FudHNTZXNzaW9uUmVz dG9yYXRpb25SZW5kZXJUcmVlU2l6ZVRocmVzaG9sZEV2ZW50KGZhbHNlKQorICAgICwgbV9oaXRS ZW5kZXJUcmVlU2l6ZVRocmVzaG9sZChmYWxzZSkKICAgICAsIG1fc2hvdWxkU2VuZEV2ZW50c1N5 bmNocm9ub3VzbHkoZmFsc2UpCiAgICAgLCBtX3N1cHByZXNzVmlzaWJpbGl0eVVwZGF0ZXMoZmFs c2UpCiAgICAgLCBtX2F1dG9TaXppbmdTaG91bGRFeHBhbmRUb1ZpZXdIZWlnaHQoZmFsc2UpCkBA IC0xOTI5LDExICsxOTMyLDE1IEBAIFNlc3Npb25TdGF0ZSBXZWJQYWdlUHJveHk6OnNlc3Npb25T dGF0ZShjb25zdCBzdGQ6OmZ1bmN0aW9uPGJvb2wgKFdlYkJhY2tGb3J3YXJkCiAgICAgaWYgKCFw cm92aXNpb25hbFVSTFN0cmluZy5pc0VtcHR5KCkpCiAgICAgICAgIHNlc3Npb25TdGF0ZS5wcm92 aXNpb25hbFVSTCA9IFVSTChVUkwoKSwgcHJvdmlzaW9uYWxVUkxTdHJpbmcpOwogCisgICAgc2Vz c2lvblN0YXRlLnJlbmRlclRyZWVTaXplID0gcmVuZGVyVHJlZVNpemUoKTsKICAgICByZXR1cm4g c2Vzc2lvblN0YXRlOwogfQogCiB1aW50NjRfdCBXZWJQYWdlUHJveHk6OnJlc3RvcmVGcm9tU2Vz c2lvblN0YXRlKFNlc3Npb25TdGF0ZSBzZXNzaW9uU3RhdGUsIGJvb2wgbmF2aWdhdGUpCiB7Cisg ICAgbV9zZXNzaW9uUmVzdG9yYXRpb25SZW5kZXJUcmVlU2l6ZSA9IDA7CisgICAgbV9oaXRSZW5k ZXJUcmVlU2l6ZVRocmVzaG9sZCA9IGZhbHNlOworCiAgICAgYm9vbCBoYXNCYWNrRm9yd2FyZExp c3QgPSAhIXNlc3Npb25TdGF0ZS5iYWNrRm9yd2FyZExpc3RTdGF0ZS5jdXJyZW50SW5kZXg7CiAK ICAgICBpZiAoaGFzQmFja0ZvcndhcmRMaXN0KSB7CkBAIC0xOTQ1LDggKzE5NTIsOSBAQCB1aW50 NjRfdCBXZWJQYWdlUHJveHk6OnJlc3RvcmVGcm9tU2Vzc2lvblN0YXRlKFNlc3Npb25TdGF0ZSBz ZXNzaW9uU3RhdGUsIGJvb2wgbgogICAgICAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2Vi UGFnZTo6UmVzdG9yZVNlc3Npb24obV9iYWNrRm9yd2FyZExpc3QtPml0ZW1TdGF0ZXMoKSksIG1f cGFnZUlEKTsKICAgICB9CiAKKyAgICAvLyBGSVhNRTogTmF2aWdhdGluZyBzaG91bGQgYmUgc2Vw YXJhdGUgZnJvbSBzdGF0ZSByZXN0b3JhdGlvbi4KICAgICBpZiAobmF2aWdhdGUpIHsKLSAgICAg ICAgLy8gRklYTUU6IE5hdmlnYXRpbmcgc2hvdWxkIGJlIHNlcGFyYXRlIGZyb20gc3RhdGUgcmVz dG9yYXRpb24uCisgICAgICAgIG1fc2Vzc2lvblJlc3RvcmF0aW9uUmVuZGVyVHJlZVNpemUgPSBz ZXNzaW9uU3RhdGUucmVuZGVyVHJlZVNpemU7CiAKICAgICAgICAgaWYgKCFzZXNzaW9uU3RhdGUu cHJvdmlzaW9uYWxVUkwuaXNOdWxsKCkpCiAgICAgICAgICAgICByZXR1cm4gbG9hZFJlcXVlc3Qo c2Vzc2lvblN0YXRlLnByb3Zpc2lvbmFsVVJMKTsKQEAgLTIxMDUsNiArMjExMyw4IEBAIHZvaWQg V2ViUGFnZVByb3h5OjpsaXN0ZW5Gb3JMYXlvdXRNaWxlc3RvbmVzKFdlYkNvcmU6OkxheW91dE1p bGVzdG9uZXMgbWlsZXN0b25lCiB7CiAgICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAgICAgIHJldHVy bjsKKyAgICAKKyAgICBtX3dhbnRzU2Vzc2lvblJlc3RvcmF0aW9uUmVuZGVyVHJlZVNpemVUaHJl c2hvbGRFdmVudCA9IG1pbGVzdG9uZXMgJiBXZWJDb3JlOjpSZWFjaGVkU2Vzc2lvblJlc3RvcmF0 aW9uUmVuZGVyVHJlZVNpemVUaHJlc2hvbGQ7CiAKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2U6Okxpc3RlbkZvckxheW91dE1pbGVzdG9uZXMobWlsZXN0b25lcyksIG1fcGFn ZUlEKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBjYjI0 ZDc4ZGY5Nzk4OTk2MGE0NDQ1ZjZhZTEyZjA0ZGFiMzZlZGZiLi5iMzZiMjRmMjdkZmNiNTk4YzQ5 ZDM0YjdmMzdjZTZmN2M5OTUxODYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oCkBAIC0xNTUwLDYgKzE1NTAsOSBAQCBwcml2YXRlOgogICAgIFdlYkNvcmU6OkludFJl Y3QgbV92aXNpYmxlU2Nyb2xsZXJUaHVtYlJlY3Q7CiAKICAgICB1aW50NjRfdCBtX3JlbmRlclRy ZWVTaXplOworICAgIHVpbnQ2NF90IG1fc2Vzc2lvblJlc3RvcmF0aW9uUmVuZGVyVHJlZVNpemU7 CisgICAgYm9vbCBtX3dhbnRzU2Vzc2lvblJlc3RvcmF0aW9uUmVuZGVyVHJlZVNpemVUaHJlc2hv bGRFdmVudDsKKyAgICBib29sIG1faGl0UmVuZGVyVHJlZVNpemVUaHJlc2hvbGQ7CiAKICAgICBi b29sIG1fc2hvdWxkU2VuZEV2ZW50c1N5bmNocm9ub3VzbHk7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0KaW5kZXggZTAxZjhhYzc5Y2E2YmVi ZDgyZWI0NzU5YjUyNmVhYWIyMmY2YjQzOS4uNTkzNmRhZmE3MTNiYWFmZjllNGFhYjEzOWQxZTI0 OTQxZjU4MmQyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQ YWdlUHJveHlJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQYWdl UHJveHlJT1MubW0KQEAgLTMzMiw2ICszMzIsMTIgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNldERl dmljZU9yaWVudGF0aW9uKGludDMyX3QgZGV2aWNlT3JpZW50YXRpb24pCiAgICAgfQogfQogCitz dGF0aWMgYm9vbCBleGNlZWRzUmVuZGVyVHJlZVNpemVTaXplVGhyZXNob2xkKHVpbnQ2NF90IHRo cmVzaG9sZFNpemUsIHVpbnQ2NF90IGNvbW1pdHRlZFNpemUpCit7CisgICAgY29uc3QgZG91Ymxl IHRoZXNob2xkU2l6ZUZyYWN0aW9uID0gMC41OyAvLyBFbXBpcmljYWxseS1kZXJpdmVkLgorICAg IHJldHVybiBjb21taXR0ZWRTaXplID4gdGhyZXNob2xkU2l6ZSAqIHRoZXNob2xkU2l6ZUZyYWN0 aW9uOworfQorCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ29tbWl0TGF5ZXJUcmVlKGNvbnN0IFdl YktpdDo6UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24mIGxheWVyVHJlZVRyYW5zYWN0aW9uKQog ewogICAgIG1fcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yID0gbGF5ZXJUcmVlVHJhbnNhY3Rp b24ucGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yKCk7CkBAIC0zNDksNiArMzU1LDEyIEBAIHZv aWQgV2ViUGFnZVByb3h5OjpkaWRDb21taXRMYXllclRyZWUoY29uc3QgV2ViS2l0OjpSZW1vdGVM YXllclRyZWVUcmFuc2FjdGlvbiYKICAgICB9CiAKICAgICBtX3BhZ2VDbGllbnQuZGlkQ29tbWl0 TGF5ZXJUcmVlKGxheWVyVHJlZVRyYW5zYWN0aW9uKTsKKworICAgIGlmIChtX3dhbnRzU2Vzc2lv blJlc3RvcmF0aW9uUmVuZGVyVHJlZVNpemVUaHJlc2hvbGRFdmVudCAmJiAhbV9oaXRSZW5kZXJU cmVlU2l6ZVRocmVzaG9sZAorICAgICAgICAmJiBleGNlZWRzUmVuZGVyVHJlZVNpemVTaXplVGhy ZXNob2xkKG1fc2Vzc2lvblJlc3RvcmF0aW9uUmVuZGVyVHJlZVNpemUsIGxheWVyVHJlZVRyYW5z YWN0aW9uLnJlbmRlclRyZWVTaXplKCkpKSB7CisgICAgICAgIG1faGl0UmVuZGVyVHJlZVNpemVU aHJlc2hvbGQgPSB0cnVlOworICAgICAgICBtX2xvYWRlckNsaWVudC0+ZGlkTGF5b3V0KHRoaXMs IFdlYkNvcmU6OlJlYWNoZWRTZXNzaW9uUmVzdG9yYXRpb25SZW5kZXJUcmVlU2l6ZVRocmVzaG9s ZCwgbnVsbHB0cik7CisgICAgfQogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2VsZWN0V2l0aEdl c3R1cmUoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQgcG9pbnQsIFdlYkNvcmU6OlRleHRHcmFudWxh cml0eSBncmFudWxhcml0eSwgdWludDMyX3QgZ2VzdHVyZVR5cGUsIHVpbnQzMl90IGdlc3R1cmVT dGF0ZSwgc3RkOjpmdW5jdGlvbjx2b2lkIChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYsIHVpbnQz Ml90LCB1aW50MzJfdCwgdWludDMyX3QsIENhbGxiYWNrQmFzZTo6RXJyb3IpPiBjYWxsYmFja0Z1 bmN0aW9uKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdhY3lT ZXNzaW9uU3RhdGVDb2RpbmcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdh Y3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwCmluZGV4IDdkYzY4OTg5YWM3NDllNGVhNmIzNThlNjI4 NTA4MWUxNGVhNjY5MTkuLjQwMmY0MGU3OWM2NzcwZGE0OWM5Yjg5MmZlNDFiYTczNDYxOGMwZjEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lvblN0 YXRlQ29kaW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL0xlZ2FjeVNl c3Npb25TdGF0ZUNvZGluZy5jcHAKQEAgLTM2LDEwICszNiwxNSBAQAogbmFtZXNwYWNlIFdlYktp dCB7CiAKIC8vIFNlc3Npb24gc3RhdGUga2V5cy4KKyNpZiBQTEFURk9STShJT1MpCitzdGF0aWMg Y29uc3QgdWludDMyX3Qgc2Vzc2lvblN0YXRlRGF0YVZlcnNpb24gPSAzOworI2Vsc2UKIHN0YXRp YyBjb25zdCB1aW50MzJfdCBzZXNzaW9uU3RhdGVEYXRhVmVyc2lvbiA9IDI7CisjZW5kaWYKIAog c3RhdGljIGNvbnN0IENGU3RyaW5nUmVmIHNlc3Npb25IaXN0b3J5S2V5ID0gQ0ZTVFIoIlNlc3Np b25IaXN0b3J5Iik7CiBzdGF0aWMgY29uc3QgQ0ZTdHJpbmdSZWYgcHJvdmlzaW9uYWxVUkxLZXkg PSBDRlNUUigiUHJvdmlzaW9uYWxVUkwiKTsKK3N0YXRpYyBjb25zdCBDRlN0cmluZ1JlZiByZW5k ZXJUcmVlU2l6ZUtleSA9IENGU1RSKCJSZW5kZXJUcmVlU2l6ZSIpOwogCiAvLyBTZXNzaW9uIGhp c3Rvcnkga2V5cy4KIHN0YXRpYyBjb25zdCB1aW50MzJfdCBzZXNzaW9uSGlzdG9yeVZlcnNpb24g PSAxOwpAQCAtNTAsOSArNTUsOSBAQCBzdGF0aWMgY29uc3QgQ0ZTdHJpbmdSZWYgc2Vzc2lvbkhp c3RvcnlFbnRyaWVzS2V5ID0gQ0ZTVFIoIlNlc3Npb25IaXN0b3J5RW50cmllcwogCiAvLyBTZXNz aW9uIGhpc3RvcnkgZW50cnkga2V5cy4KIHN0YXRpYyBjb25zdCBDRlN0cmluZ1JlZiBzZXNzaW9u SGlzdG9yeUVudHJ5VVJMS2V5ID0gQ0ZTVFIoIlNlc3Npb25IaXN0b3J5RW50cnlVUkwiKTsKLXN0 YXRpYyBDRlN0cmluZ1JlZiBzZXNzaW9uSGlzdG9yeUVudHJ5VGl0bGVLZXkgPSBDRlNUUigiU2Vz c2lvbkhpc3RvcnlFbnRyeVRpdGxlIik7Ci1zdGF0aWMgQ0ZTdHJpbmdSZWYgc2Vzc2lvbkhpc3Rv cnlFbnRyeU9yaWdpbmFsVVJMS2V5ID0gQ0ZTVFIoIlNlc3Npb25IaXN0b3J5RW50cnlPcmlnaW5h bFVSTCIpOwotc3RhdGljIENGU3RyaW5nUmVmIHNlc3Npb25IaXN0b3J5RW50cnlEYXRhS2V5ID0g Q0ZTVFIoIlNlc3Npb25IaXN0b3J5RW50cnlEYXRhIik7CitzdGF0aWMgY29uc3QgQ0ZTdHJpbmdS ZWYgc2Vzc2lvbkhpc3RvcnlFbnRyeVRpdGxlS2V5ID0gQ0ZTVFIoIlNlc3Npb25IaXN0b3J5RW50 cnlUaXRsZSIpOworc3RhdGljIGNvbnN0IENGU3RyaW5nUmVmIHNlc3Npb25IaXN0b3J5RW50cnlP cmlnaW5hbFVSTEtleSA9IENGU1RSKCJTZXNzaW9uSGlzdG9yeUVudHJ5T3JpZ2luYWxVUkwiKTsK K3N0YXRpYyBjb25zdCBDRlN0cmluZ1JlZiBzZXNzaW9uSGlzdG9yeUVudHJ5RGF0YUtleSA9IENG U1RSKCJTZXNzaW9uSGlzdG9yeUVudHJ5RGF0YSIpOwogCiAvLyBTZXNzaW9uIGhpc3RvcnkgZW50 cnkgZGF0YS4KIGNvbnN0IHVpbnQzMl90IHNlc3Npb25IaXN0b3J5RW50cnlEYXRhVmVyc2lvbiA9 IDI7CkBAIC00MjYsNyArNDMxLDEyIEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0ZEaWN0aW9uYXJ5UmVm PiBlbmNvZGVTZXNzaW9uSGlzdG9yeShjb25zdCBCYWNrRm9yd2FyZExpc3RTdGF0CiAgICAgICAg IGF1dG8gb3JpZ2luYWxVUkwgPSBpdGVtLnBhZ2VTdGF0ZS5tYWluRnJhbWVTdGF0ZS5vcmlnaW5h bFVSTFN0cmluZy5jcmVhdGVDRlN0cmluZygpOwogICAgICAgICBhdXRvIGRhdGEgPSBlbmNvZGVT ZXNzaW9uSGlzdG9yeUVudHJ5RGF0YShpdGVtLnBhZ2VTdGF0ZS5tYWluRnJhbWVTdGF0ZSk7CiAK LSAgICAgICAgYXV0byBlbnRyeURpY3Rpb25hcnkgPSBjcmVhdGVEaWN0aW9uYXJ5KHsgeyBzZXNz aW9uSGlzdG9yeUVudHJ5VVJMS2V5LCB1cmwuZ2V0KCkgfSwgeyBzZXNzaW9uSGlzdG9yeUVudHJ5 VGl0bGVLZXksIHRpdGxlLmdldCgpIH0sIHsgc2Vzc2lvbkhpc3RvcnlFbnRyeU9yaWdpbmFsVVJM S2V5LCBvcmlnaW5hbFVSTC5nZXQoKSB9LCB7IHNlc3Npb25IaXN0b3J5RW50cnlEYXRhS2V5LCBk YXRhLmdldCgpIH0gfSk7CisgICAgICAgIGF1dG8gZW50cnlEaWN0aW9uYXJ5ID0gY3JlYXRlRGlj dGlvbmFyeSh7CisgICAgICAgICAgICB7IHNlc3Npb25IaXN0b3J5RW50cnlVUkxLZXksIHVybC5n ZXQoKSB9LAorICAgICAgICAgICAgeyBzZXNzaW9uSGlzdG9yeUVudHJ5VGl0bGVLZXksIHRpdGxl LmdldCgpIH0sCisgICAgICAgICAgICB7IHNlc3Npb25IaXN0b3J5RW50cnlPcmlnaW5hbFVSTEtl eSwgb3JpZ2luYWxVUkwuZ2V0KCkgfSwKKyAgICAgICAgICAgIHsgc2Vzc2lvbkhpc3RvcnlFbnRy eURhdGFLZXksIGRhdGEuZ2V0KCkgfSwKKyAgICAgICAgfSk7CiAKICAgICAgICAgQ0ZBcnJheUFw cGVuZFZhbHVlKGVudHJpZXMuZ2V0KCksIGVudHJ5RGljdGlvbmFyeS5nZXQoKSk7CiAgICAgfQpA QCAtNDQyLDExICs0NTIsMjcgQEAgUmVmUHRyPEFQSTo6RGF0YT4gZW5jb2RlTGVnYWN5U2Vzc2lv blN0YXRlKGNvbnN0IFNlc3Npb25TdGF0ZSYgc2Vzc2lvblN0YXRlKQogICAgIGF1dG8gc2Vzc2lv bkhpc3RvcnlEaWN0aW9uYXJ5ID0gZW5jb2RlU2Vzc2lvbkhpc3Rvcnkoc2Vzc2lvblN0YXRlLmJh Y2tGb3J3YXJkTGlzdFN0YXRlKTsKICAgICBhdXRvIHByb3Zpc2lvbmFsVVJMU3RyaW5nID0gc2Vz c2lvblN0YXRlLnByb3Zpc2lvbmFsVVJMLmlzTnVsbCgpID8gbnVsbHB0ciA6IHNlc3Npb25TdGF0 ZS5wcm92aXNpb25hbFVSTC5zdHJpbmcoKS5jcmVhdGVDRlN0cmluZygpOwogCisjaWYgUExBVEZP Uk0oSU9TKQorICAgIFJldGFpblB0cjxDRk51bWJlclJlZj4gcmVuZGVyVHJlZVNpemVOdW1iZXIo YWRvcHRDRihDRk51bWJlckNyZWF0ZShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBrQ0ZOdW1iZXJTSW50 NjRUeXBlLCAmc2Vzc2lvblN0YXRlLnJlbmRlclRyZWVTaXplKSkpOworI2VuZGlmCisKICAgICBS ZXRhaW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPiBzdGF0ZURpY3Rpb25hcnk7Ci0gICAgaWYgKHByb3Zp c2lvbmFsVVJMU3RyaW5nKQotICAgICAgICBzdGF0ZURpY3Rpb25hcnkgPSBjcmVhdGVEaWN0aW9u YXJ5KHsgeyBzZXNzaW9uSGlzdG9yeUtleSwgc2Vzc2lvbkhpc3RvcnlEaWN0aW9uYXJ5LmdldCgp IH0sIHsgcHJvdmlzaW9uYWxVUkxLZXksIHByb3Zpc2lvbmFsVVJMU3RyaW5nLmdldCgpIH0gfSk7 Ci0gICAgZWxzZQotICAgICAgICBzdGF0ZURpY3Rpb25hcnkgPSBjcmVhdGVEaWN0aW9uYXJ5KHsg eyBzZXNzaW9uSGlzdG9yeUtleSwgc2Vzc2lvbkhpc3RvcnlEaWN0aW9uYXJ5LmdldCgpIH0gfSk7 CisgICAgaWYgKHByb3Zpc2lvbmFsVVJMU3RyaW5nKSB7CisgICAgICAgIHN0YXRlRGljdGlvbmFy eSA9IGNyZWF0ZURpY3Rpb25hcnkoeworICAgICAgICAgICAgeyBzZXNzaW9uSGlzdG9yeUtleSwg c2Vzc2lvbkhpc3RvcnlEaWN0aW9uYXJ5LmdldCgpIH0sCisgICAgICAgICAgICB7IHByb3Zpc2lv bmFsVVJMS2V5LCBwcm92aXNpb25hbFVSTFN0cmluZy5nZXQoKSB9LAorI2lmIFBMQVRGT1JNKElP UykKKyAgICAgICAgICAgIHsgcmVuZGVyVHJlZVNpemVLZXksIHJlbmRlclRyZWVTaXplTnVtYmVy LmdldCgpIH0KKyNlbmRpZgorICAgICAgICB9KTsKKyAgICB9IGVsc2UgeworICAgICAgICBzdGF0 ZURpY3Rpb25hcnkgPSBjcmVhdGVEaWN0aW9uYXJ5KHsKKyAgICAgICAgICAgIHsgc2Vzc2lvbkhp c3RvcnlLZXksIHNlc3Npb25IaXN0b3J5RGljdGlvbmFyeS5nZXQoKSB9LAorI2lmIFBMQVRGT1JN KElPUykKKyAgICAgICAgICAgIHsgcmVuZGVyVHJlZVNpemVLZXksIHJlbmRlclRyZWVTaXplTnVt YmVyLmdldCgpIH0KKyNlbmRpZgorICAgICAgICB9KTsKKyAgICB9CiAKICAgICBhdXRvIHdyaXRl U3RyZWFtID0gYWRvcHRDRihDRldyaXRlU3RyZWFtQ3JlYXRlV2l0aEFsbG9jYXRlZEJ1ZmZlcnMo a0NGQWxsb2NhdG9yRGVmYXVsdCwgbnVsbHB0cikpOwogICAgIGlmICghd3JpdGVTdHJlYW0pCkBA IC05MDIsOCArOTI4LDggQEAgc3RhdGljIHZvaWQgZGVjb2RlQmFja0ZvcndhcmRUcmVlTm9kZShI aXN0b3J5RW50cnlEYXRhRGVjb2RlciYgZGVjb2RlciwgRnJhbWVTdGEKIAogICAgIGRlY29kZXIg Pj4gZnJhbWVTdGF0ZS50YXJnZXQ7CiAKLSAgICAvLyBGSVhNRTogaU9TIHNob3VsZCBub3QgdXNl IHRoZSBsZWdhY3kgc2Vzc2lvbiBzdGF0ZSBkZWNvZGVyLgogI2lmIFBMQVRGT1JNKElPUykKKyAg ICAvLyBGSVhNRTogaU9TIHNob3VsZCBub3QgdXNlIHRoZSBsZWdhY3kgc2Vzc2lvbiBzdGF0ZSBk ZWNvZGVyLgogICAgIGRlY29kZXIgPj4gZnJhbWVTdGF0ZS5leHBvc2VkQ29udGVudFJlY3Q7CiAg ICAgZGVjb2RlciA+PiBmcmFtZVN0YXRlLnVub2JzY3VyZWRDb250ZW50UmVjdDsKICAgICBkZWNv ZGVyID4+IGZyYW1lU3RhdGUubWluaW11bUxheW91dFNpemVJblNjcm9sbFZpZXdDb29yZGluYXRl czsKQEAgLTEwODcsNiArMTExMywxMSBAQCBib29sIGRlY29kZUxlZ2FjeVNlc3Npb25TdGF0ZShj b25zdCB1aW50OF90KiBieXRlcywgc2l6ZV90IHNpemUsIFNlc3Npb25TdGF0ZSYgcwogICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAorI2lmIFBMQVRGT1JNKElPUykKKyAgICBpZiAo YXV0byByZW5kZXJUcmVlU2l6ZSA9IGR5bmFtaWNfY2ZfY2FzdDxDRk51bWJlclJlZj4oQ0ZEaWN0 aW9uYXJ5R2V0VmFsdWUoc2Vzc2lvblN0YXRlRGljdGlvbmFyeS5nZXQoKSwgcmVuZGVyVHJlZVNp emVLZXkpKSkKKyAgICAgICAgQ0ZOdW1iZXJHZXRWYWx1ZShyZW5kZXJUcmVlU2l6ZSwga0NGTnVt YmVyU0ludDY0VHlwZSwgJnNlc3Npb25TdGF0ZS5yZW5kZXJUcmVlU2l6ZSk7CisjZW5kaWYKKwog ICAgIHJldHVybiB0cnVlOwogfQogCg==