186301 2018-06-04 22:51:09 -0700 [Cocoa] Update some JavaScriptCore code to be more ready for ARC 2021-01-28 14:58:44 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 221107 1 darin darin andersca dbates ews-watchlist joepeck keith_miller mark.lam mitz msaboff saam webkit-bug-importer oldest_to_newest 1430043 0 darin 2018-06-04 22:51:09 -0700 [Cocoa] Update some JavaScriptCore code to be more ready for ARC 1430044 1 341955 darin 2018-06-04 22:52:55 -0700 Created attachment 341955 Patch 1430086 2 341955 andersca 2018-06-05 07:20:17 -0700 Comment on attachment 341955 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=341955&action=review > Source/JavaScriptCore/API/JSAPIWrapperObject.mm:95 > - m_wrappedObject = [static_cast<id>(wrappedObject) retain]; > + m_wrappedObject = (__bridge id)wrappedObject; Won't this lead to a memory leak when compiling without ARC now? 1430092 3 341955 darin 2018-06-05 08:15:19 -0700 Comment on attachment 341955 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=341955&action=review >> Source/JavaScriptCore/API/JSAPIWrapperObject.mm:95 >> + m_wrappedObject = (__bridge id)wrappedObject; > > Won't this lead to a memory leak when compiling without ARC now? Yes should have omitted this change; will remove it. I’ve been doing a verification pass on these “ARC prep” patches where I search for release and retain in the patch, which I think would have caught this. 1430101 4 341969 darin 2018-06-05 08:50:49 -0700 Created attachment 341969 Patch 1430102 5 darin 2018-06-05 08:51:32 -0700 New patch omits the incorrect change Anders pointed out, and also fixes another leak elsewhere in the patch. 1430104 6 341970 darin 2018-06-05 08:53:01 -0700 Created attachment 341970 Patch 1430111 7 darin 2018-06-05 09:16:07 -0700 This quite small patch should be straightforward and correct now. 1430131 8 darin 2018-06-05 10:25:05 -0700 Committed r232513: <https://trac.webkit.org/changeset/232513> 1430133 9 webkit-bug-importer 2018-06-05 10:26:26 -0700 <rdar://problem/40812844> 341955 2018-06-04 22:52:55 -0700 2018-06-05 08:50:47 -0700 Patch bug-186301-20180604225254.patch text/plain 5926 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 MDJhOWNjZGYyYTU5YThjNWFkNWQ2YzZhMjBhMzU5ZWE2ODg4OGUxLi5lNzk5MjUwZjA5ZmNlYzBj ZDg5MzJhZWU4NWM4MDA0Y2ZlYzRjOGE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxOC0wNi0wNCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CisK KyAgICAgICAgW0NvY29hXSBVcGRhdGUgc29tZSBKYXZhU2NyaXB0Q29yZSBjb2RlIHRvIGJlIG1v cmUgcmVhZHkgZm9yIEFSQworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTg2MzAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBBUEkvSlNBUElXcmFwcGVyT2JqZWN0Lm1tOgorICAgICAgICAoSlNBUElXcmFw cGVyT2JqZWN0SGFuZGxlT3duZXI6OmZpbmFsaXplKTogVXNlIF9fYnJpZGdlIGZvciB0eXBlY2Fz dC4KKyAgICAgICAgKEpTQzo6SlNBUElXcmFwcGVyT2JqZWN0OjpzZXRXcmFwcGVkT2JqZWN0KTog RGl0dG8uCisgICAgICAgICogQVBJL0pTQ29udGV4dC5tbToKKyAgICAgICAgKC1bSlNDb250ZXh0 IGV2YWx1YXRlU2NyaXB0OndpdGhTb3VyY2VVUkw6XSk6IERpdHRvLgorICAgICAgICAoLVtKU0Nv bnRleHQgc2V0TmFtZTpdKTogRGl0dG8uCisgICAgICAgICogaW5zcGVjdG9yL3JlbW90ZS9jb2Nv YS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbToKKyAgICAgICAgKEluc3BlY3Rvcjo6UmVtb3RlSW5z cGVjdG9yOjpyZWNlaXZlZFByb3h5QXBwbGljYXRpb25TZXR1cE1lc3NhZ2UpOgorICAgICAgICBE aXR0by4KKworICAgICAgICAqIGluc3BlY3Rvci9yZW1vdGUvY29jb2EvUmVtb3RlSW5zcGVjdG9y WFBDQ29ubmVjdGlvbi5tbToKKyAgICAgICAgKEluc3BlY3Rvcjo6UmVtb3RlSW5zcGVjdG9yWFBD Q29ubmVjdGlvbjo6ZGVzZXJpYWxpemVNZXNzYWdlKToKKyAgICAgICAgVXNlIENGQnJpZGdpbmdS ZWxlYXNlIGluc3RlYWQgb2YgYXV0b3JlbGVhc2UgZm9yIGEgQ0YgZGljdGlvbmFyeSB0aGF0Cisg ICAgICAgIHdlIHJldHVybiBhcyBhbiBOU0RpY3Rpb25hcnkuCisKIDIwMTgtMDYtMDQgIEtlaXRo IE1pbGxlciAgPGtlaXRoX21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIG1pc3Np bmcgZmlsZXMgZnJvbSBKYXZhU2NyaXB0Q29yZSBYY29kZSBwcm9qZWN0CmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTQVBJV3JhcHBlck9iamVjdC5tbSBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9BUEkvSlNBUElXcmFwcGVyT2JqZWN0Lm1tCmluZGV4IDk3OWZmOWI5ZWQw YWYyMTcwNDIzY2NmOTQ1MmQxYTlhNmQwZmVmYmQuLmE2YjYzMWYwYmYyNzE0MDgyYWE5NDVkMWFk YTNhYTBmZTY0OTY0MWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNB UElXcmFwcGVyT2JqZWN0Lm1tCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNBUElX cmFwcGVyT2JqZWN0Lm1tCkBAIC01Miw3ICs1Miw3IEBAIHZvaWQgSlNBUElXcmFwcGVyT2JqZWN0 SGFuZGxlT3duZXI6OmZpbmFsaXplKEpTQzo6SGFuZGxlPEpTQzo6VW5rbm93bj4gaGFuZGxlLCB2 CiAgICAgaWYgKCF3cmFwcGVyT2JqZWN0LT53cmFwcGVkT2JqZWN0KCkpCiAgICAgICAgIHJldHVy bjsKIAotICAgIEpTQzo6SGVhcDo6aGVhcCh3cmFwcGVyT2JqZWN0KS0+cmVsZWFzZVNvb24oYWRv cHROUyhzdGF0aWNfY2FzdDxpZD4od3JhcHBlck9iamVjdC0+d3JhcHBlZE9iamVjdCgpKSkpOwor ICAgIEpTQzo6SGVhcDo6aGVhcCh3cmFwcGVyT2JqZWN0KS0+cmVsZWFzZVNvb24oYWRvcHROUygo X19icmlkZ2UgaWQpd3JhcHBlck9iamVjdC0+d3JhcHBlZE9iamVjdCgpKSk7CiAgICAgSlNDOjpX ZWFrU2V0OjpkZWFsbG9jYXRlKEpTQzo6V2Vha0ltcGw6OmFzV2Vha0ltcGwoaGFuZGxlLnNsb3Qo KSkpOwogfQogCkBAIC05Miw3ICs5Miw3IEBAIHZvaWQgSlNBUElXcmFwcGVyT2JqZWN0OjpmaW5p c2hDcmVhdGlvbihWTSYgdm0pCiB2b2lkIEpTQVBJV3JhcHBlck9iamVjdDo6c2V0V3JhcHBlZE9i amVjdCh2b2lkKiB3cmFwcGVkT2JqZWN0KQogewogICAgIEFTU0VSVCghbV93cmFwcGVkT2JqZWN0 KTsKLSAgICBtX3dyYXBwZWRPYmplY3QgPSBbc3RhdGljX2Nhc3Q8aWQ+KHdyYXBwZWRPYmplY3Qp IHJldGFpbl07CisgICAgbV93cmFwcGVkT2JqZWN0ID0gKF9fYnJpZGdlIGlkKXdyYXBwZWRPYmpl Y3Q7CiB9CiAKIHZvaWQgSlNBUElXcmFwcGVyT2JqZWN0Ojp2aXNpdENoaWxkcmVuKEpTQ2VsbCog Y2VsbCwgSlNDOjpTbG90VmlzaXRvciYgdmlzaXRvcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9BUEkvSlNDb250ZXh0Lm1tIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9K U0NvbnRleHQubW0KaW5kZXggYWRiNzgwMTM4ZDg1NzkzYWM2OWM0Y2M0YmFkOGZiMjg4ZjczMjEz OS4uNjNhNDU0MTQzOGEyMTVjNzYyMmNmMWRjYTM5ZWQyOGQxZGNlMzUyZiAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHQubW0KKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL0FQSS9KU0NvbnRleHQubW0KQEAgLTEwMCw4ICsxMDAsOCBAQCAtIChKU1ZhbHVl ICopZXZhbHVhdGVTY3JpcHQ6KE5TU3RyaW5nICopc2NyaXB0CiAtIChKU1ZhbHVlICopZXZhbHVh dGVTY3JpcHQ6KE5TU3RyaW5nICopc2NyaXB0IHdpdGhTb3VyY2VVUkw6KE5TVVJMICopc291cmNl VVJMCiB7CiAgICAgSlNWYWx1ZVJlZiBleGNlcHRpb25WYWx1ZSA9IG51bGxwdHI7Ci0gICAgSlNT dHJpbmdSZWYgc2NyaXB0SlMgPSBKU1N0cmluZ0NyZWF0ZVdpdGhDRlN0cmluZygoQ0ZTdHJpbmdS ZWYpc2NyaXB0KTsKLSAgICBKU1N0cmluZ1JlZiBzb3VyY2VVUkxKUyA9IHNvdXJjZVVSTCA/IEpT U3RyaW5nQ3JlYXRlV2l0aENGU3RyaW5nKChDRlN0cmluZ1JlZilbc291cmNlVVJMIGFic29sdXRl U3RyaW5nXSkgOiBudWxscHRyOworICAgIEpTU3RyaW5nUmVmIHNjcmlwdEpTID0gSlNTdHJpbmdD cmVhdGVXaXRoQ0ZTdHJpbmcoKF9fYnJpZGdlIENGU3RyaW5nUmVmKXNjcmlwdCk7CisgICAgSlNT dHJpbmdSZWYgc291cmNlVVJMSlMgPSBzb3VyY2VVUkwgPyBKU1N0cmluZ0NyZWF0ZVdpdGhDRlN0 cmluZygoX19icmlkZ2UgQ0ZTdHJpbmdSZWYpW3NvdXJjZVVSTCBhYnNvbHV0ZVN0cmluZ10pIDog bnVsbHB0cjsKICAgICBKU1ZhbHVlUmVmIHJlc3VsdCA9IEpTRXZhbHVhdGVTY3JpcHQobV9jb250 ZXh0LCBzY3JpcHRKUywgbnVsbHB0ciwgc291cmNlVVJMSlMsIDAsICZleGNlcHRpb25WYWx1ZSk7 CiAgICAgaWYgKHNvdXJjZVVSTEpTKQogICAgICAgICBKU1N0cmluZ1JlbGVhc2Uoc291cmNlVVJM SlMpOwpAQCAtMjAyLDcgKzIwMiw3IEBAIC0gKE5TU3RyaW5nICopbmFtZQogCiAtICh2b2lkKXNl dE5hbWU6KE5TU3RyaW5nICopbmFtZQogewotICAgIEpTU3RyaW5nUmVmIG5hbWVKUyA9IG5hbWUg PyBKU1N0cmluZ0NyZWF0ZVdpdGhDRlN0cmluZygoQ0ZTdHJpbmdSZWYpW1tuYW1lIGNvcHldIGF1 dG9yZWxlYXNlXSkgOiBudWxscHRyOworICAgIEpTU3RyaW5nUmVmIG5hbWVKUyA9IG5hbWUgPyBK U1N0cmluZ0NyZWF0ZVdpdGhDRlN0cmluZygoX19icmlkZ2UgQ0ZTdHJpbmdSZWYpW25hbWUgY29w eV0pIDogbnVsbHB0cjsKICAgICBKU0dsb2JhbENvbnRleHRTZXROYW1lKG1fY29udGV4dCwgbmFt ZUpTKTsKICAgICBpZiAobmFtZUpTKQogICAgICAgICBKU1N0cmluZ1JlbGVhc2UobmFtZUpTKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2NvY29h L1JlbW90ZUluc3BlY3RvckNvY29hLm1tIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9yZW1vdGUvY29jb2EvUmVtb3RlSW5zcGVjdG9yQ29jb2EubW0KaW5kZXggZmNhZjRhZjIyNWU1 ZWMyZWJiZjZiNTlkYzNiYjE3MGJkZGQ5ZDA5My4uYjcxNjkxMTU4ZmMzOGFkMjEyMWUzMWEyYTdi YWEzNDk3ZWMwMzRmMiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9yZW1vdGUvY29jb2EvUmVtb3RlSW5zcGVjdG9yQ29jb2EubW0KKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvY29jb2EvUmVtb3RlSW5zcGVjdG9yQ29jb2EubW0K QEAgLTYyNyw3ICs2MjcsNyBAQCB2b2lkIFJlbW90ZUluc3BlY3Rvcjo6cmVjZWl2ZWRQcm94eUFw cGxpY2F0aW9uU2V0dXBNZXNzYWdlKE5TRGljdGlvbmFyeSAqKQogCiAgICAgbV9yZWxheUNvbm5l Y3Rpb24tPnNlbmRNZXNzYWdlKFdJUlByb3h5QXBwbGljYXRpb25TZXR1cFJlc3BvbnNlTWVzc2Fn ZSwgQHsKICAgICAgICAgV0lSUHJveHlBcHBsaWNhdGlvblBhcmVudFBJREtleTogQChtX3BhcmVu dFByb2Nlc3NJZGVudGlmaWVyKSwKLSAgICAgICAgV0lSUHJveHlBcHBsaWNhdGlvblBhcmVudEF1 ZGl0RGF0YUtleTogKE5TRGF0YSAqKW1fcGFyZW50UHJvY2Vzc0F1ZGl0RGF0YS5nZXQoKSwKKyAg ICAgICAgV0lSUHJveHlBcHBsaWNhdGlvblBhcmVudEF1ZGl0RGF0YUtleTogKF9fYnJpZGdlIE5T RGF0YSAqKW1fcGFyZW50UHJvY2Vzc0F1ZGl0RGF0YS5nZXQoKSwKICAgICB9KTsKIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvY29jb2EvUmVt b3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5tbSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNw ZWN0b3IvcmVtb3RlL2NvY29hL1JlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24ubW0KaW5kZXgg Y2YwMGJhNzVjNmJlNDQ2MWYwZmQ1NjE3ZDQ0NTI0YzZmODU3OTUyYS4uY2VhNmM5YzFhZjFlNjAx MDJhMTIzNDVlY2Y5ODY5OTQzNTZiMGUzMiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2luc3BlY3Rvci9yZW1vdGUvY29jb2EvUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5t bQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1v dGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLm1tCkBAIC0xNDIsMTAgKzE0MiwxMCBAQCBOU0RpY3Rp b25hcnkgKlJlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb246OmRlc2VyaWFsaXplTWVzc2FnZSh4 cGNfb2JqZWN0X3Qgb2JqZQogICAgICAgICByZXR1cm4gbmlsOwogICAgIH0KIAotICAgIFJldGFp blB0cjxDRkRpY3Rpb25hcnlSZWY+IGRpY3Rpb25hcnkgPSBhZG9wdENGKChDRkRpY3Rpb25hcnlS ZWYpX0NGWFBDQ3JlYXRlQ0ZPYmplY3RGcm9tWFBDTWVzc2FnZSh4cGNEaWN0aW9uYXJ5KSk7Cisg ICAgYXV0byBkaWN0aW9uYXJ5ID0gX0NGWFBDQ3JlYXRlQ0ZPYmplY3RGcm9tWFBDTWVzc2FnZSh4 cGNEaWN0aW9uYXJ5KTsKICAgICBBU1NFUlRfV0lUSF9NRVNTQUdFKGRpY3Rpb25hcnksICJVbmFi bGUgdG8gZGVzZXJpYWxpemUgeHBjIG1lc3NhZ2UiKTsKLSAgICBBU1NFUlQoQ0ZHZXRUeXBlSUQo ZGljdGlvbmFyeS5nZXQoKSkgPT0gQ0ZEaWN0aW9uYXJ5R2V0VHlwZUlEKCkpOwotICAgIHJldHVy biAoTlNEaWN0aW9uYXJ5ICopZGljdGlvbmFyeS5hdXRvcmVsZWFzZSgpOworICAgIEFTU0VSVChD RkdldFR5cGVJRChkaWN0aW9uYXJ5KSA9PSBDRkRpY3Rpb25hcnlHZXRUeXBlSUQoKSk7CisgICAg cmV0dXJuIENGQnJpZGdpbmdSZWxlYXNlKGRpY3Rpb25hcnkpOwogfQogCiB2b2lkIFJlbW90ZUlu c3BlY3RvclhQQ0Nvbm5lY3Rpb246OmhhbmRsZUV2ZW50KHhwY19vYmplY3RfdCBvYmplY3QpCg== 341969 2018-06-05 08:50:49 -0700 2018-06-05 08:53:00 -0700 Patch bug-186301-20180605085048.patch text/plain 5751 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 MDJhOWNjZGYyYTU5YThjNWFkNWQ2YzZhMjBhMzU5ZWE2ODg4OGUxLi5mODkxNTFlYmU4YTNlNmY4 MWUzNDE0ZDhkYzlhNmRkMjA5MGZkYTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAxOC0wNi0wNSAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CisK KyAgICAgICAgW0NvY29hXSBVcGRhdGUgc29tZSBKYXZhU2NyaXB0Q29yZSBjb2RlIHRvIGJlIG1v cmUgcmVhZHkgZm9yIEFSQworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTg2MzAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBBUEkvSlNBUElXcmFwcGVyT2JqZWN0Lm1tOgorICAgICAgICAoSlNBUElXcmFw cGVyT2JqZWN0SGFuZGxlT3duZXI6OmZpbmFsaXplKTogVXNlIF9fYnJpZGdlIGZvciB0eXBlY2Fz dC4KKyAgICAgICAgKiBBUEkvSlNDb250ZXh0Lm1tOgorICAgICAgICAoLVtKU0NvbnRleHQgZXZh bHVhdGVTY3JpcHQ6d2l0aFNvdXJjZVVSTDpdKTogRGl0dG8uCisgICAgICAgICgtW0pTQ29udGV4 dCBzZXROYW1lOl0pOiBSZW1vdmVkIHVubmVjZXNzYXJ5IGNhbGwgdG8gY29weSwgc2luY2UgdGhl CisgICAgICAgIEpTU3RyaW5nQ3JlYXRlV2l0aENGU3RyaW5nIGZ1bmN0aW9uIGFscmVhZHkgcmVh ZHMgdGhlIGNoYXJhY3RlcnMgb3V0CisgICAgICAgIG9mIHRoZSBzdHJpbmcgYW5kIGRvZXMgbm90 IHJldGFpbiB0aGUgc3RyaW5nLCBzbyB0aGVyZSBpcyBubyBuZWVkIHRvCisgICAgICAgIG1ha2Ug YW4gaW1tdXRhYmxlIGNvcHkuIEFuZCB1c2VkIF9fYnJpZGdlIGZvciB0eXBlY2FzdC4KKyAgICAg ICAgKiBpbnNwZWN0b3IvcmVtb3RlL2NvY29hL1JlbW90ZUluc3BlY3RvckNvY29hLm1tOgorICAg ICAgICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3I6OnJlY2VpdmVkUHJveHlBcHBsaWNhdGlv blNldHVwTWVzc2FnZSk6CisgICAgICAgIERpdHRvLgorCisgICAgICAgICogaW5zcGVjdG9yL3Jl bW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLm1tOgorICAgICAgICAoSW5z cGVjdG9yOjpSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpkZXNlcmlhbGl6ZU1lc3NhZ2Up OgorICAgICAgICBVc2UgQ0ZCcmlkZ2luZ1JlbGVhc2UgaW5zdGVhZCBvZiBhdXRvcmVsZWFzZSBm b3IgYSBDRiBkaWN0aW9uYXJ5IHRoYXQKKyAgICAgICAgd2UgcmV0dXJuIGFzIGFuIE5TRGljdGlv bmFyeS4KKwogMjAxOC0wNi0wNCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNv bT4KIAogICAgICAgICBSZW1vdmUgbWlzc2luZyBmaWxlcyBmcm9tIEphdmFTY3JpcHRDb3JlIFhj b2RlIHByb2plY3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNBUElX cmFwcGVyT2JqZWN0Lm1tIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0FQSVdyYXBwZXJP YmplY3QubW0KaW5kZXggOTc5ZmY5YjllZDBhZjIxNzA0MjNjY2Y5NDUyZDFhOWE2ZDBmZWZiZC4u NmFiNmUzMzYxMzgwOGViYjYyN2E0NmMwYmQ3OTEyZWE0OGM0OTdjMyAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0FQSVdyYXBwZXJPYmplY3QubW0KKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL0FQSS9KU0FQSVdyYXBwZXJPYmplY3QubW0KQEAgLTUyLDcgKzUyLDcg QEAgdm9pZCBKU0FQSVdyYXBwZXJPYmplY3RIYW5kbGVPd25lcjo6ZmluYWxpemUoSlNDOjpIYW5k bGU8SlNDOjpVbmtub3duPiBoYW5kbGUsIHYKICAgICBpZiAoIXdyYXBwZXJPYmplY3QtPndyYXBw ZWRPYmplY3QoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgSlNDOjpIZWFwOjpoZWFwKHdyYXBw ZXJPYmplY3QpLT5yZWxlYXNlU29vbihhZG9wdE5TKHN0YXRpY19jYXN0PGlkPih3cmFwcGVyT2Jq ZWN0LT53cmFwcGVkT2JqZWN0KCkpKSk7CisgICAgSlNDOjpIZWFwOjpoZWFwKHdyYXBwZXJPYmpl Y3QpLT5yZWxlYXNlU29vbihhZG9wdE5TKChfX2JyaWRnZSBpZCl3cmFwcGVyT2JqZWN0LT53cmFw cGVkT2JqZWN0KCkpKTsKICAgICBKU0M6OldlYWtTZXQ6OmRlYWxsb2NhdGUoSlNDOjpXZWFrSW1w bDo6YXNXZWFrSW1wbChoYW5kbGUuc2xvdCgpKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9BUEkvSlNDb250ZXh0Lm1tIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQ SS9KU0NvbnRleHQubW0KaW5kZXggYWRiNzgwMTM4ZDg1NzkzYWM2OWM0Y2M0YmFkOGZiMjg4Zjcz MjEzOS4uZDhiMGE3NTYyYTAzNWYzZjdkNTQ0NGVlM2MyY2I4N2YwN2M2OTcyMyAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHQubW0KKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHQubW0KQEAgLTEwMCw4ICsxMDAsOCBAQCAtIChKU1Zh bHVlICopZXZhbHVhdGVTY3JpcHQ6KE5TU3RyaW5nICopc2NyaXB0CiAtIChKU1ZhbHVlICopZXZh bHVhdGVTY3JpcHQ6KE5TU3RyaW5nICopc2NyaXB0IHdpdGhTb3VyY2VVUkw6KE5TVVJMICopc291 cmNlVVJMCiB7CiAgICAgSlNWYWx1ZVJlZiBleGNlcHRpb25WYWx1ZSA9IG51bGxwdHI7Ci0gICAg SlNTdHJpbmdSZWYgc2NyaXB0SlMgPSBKU1N0cmluZ0NyZWF0ZVdpdGhDRlN0cmluZygoQ0ZTdHJp bmdSZWYpc2NyaXB0KTsKLSAgICBKU1N0cmluZ1JlZiBzb3VyY2VVUkxKUyA9IHNvdXJjZVVSTCA/ IEpTU3RyaW5nQ3JlYXRlV2l0aENGU3RyaW5nKChDRlN0cmluZ1JlZilbc291cmNlVVJMIGFic29s dXRlU3RyaW5nXSkgOiBudWxscHRyOworICAgIEpTU3RyaW5nUmVmIHNjcmlwdEpTID0gSlNTdHJp bmdDcmVhdGVXaXRoQ0ZTdHJpbmcoKF9fYnJpZGdlIENGU3RyaW5nUmVmKXNjcmlwdCk7CisgICAg SlNTdHJpbmdSZWYgc291cmNlVVJMSlMgPSBzb3VyY2VVUkwgPyBKU1N0cmluZ0NyZWF0ZVdpdGhD RlN0cmluZygoX19icmlkZ2UgQ0ZTdHJpbmdSZWYpW3NvdXJjZVVSTCBhYnNvbHV0ZVN0cmluZ10p IDogbnVsbHB0cjsKICAgICBKU1ZhbHVlUmVmIHJlc3VsdCA9IEpTRXZhbHVhdGVTY3JpcHQobV9j b250ZXh0LCBzY3JpcHRKUywgbnVsbHB0ciwgc291cmNlVVJMSlMsIDAsICZleGNlcHRpb25WYWx1 ZSk7CiAgICAgaWYgKHNvdXJjZVVSTEpTKQogICAgICAgICBKU1N0cmluZ1JlbGVhc2Uoc291cmNl VVJMSlMpOwpAQCAtMjAyLDcgKzIwMiw3IEBAIC0gKE5TU3RyaW5nICopbmFtZQogCiAtICh2b2lk KXNldE5hbWU6KE5TU3RyaW5nICopbmFtZQogewotICAgIEpTU3RyaW5nUmVmIG5hbWVKUyA9IG5h bWUgPyBKU1N0cmluZ0NyZWF0ZVdpdGhDRlN0cmluZygoQ0ZTdHJpbmdSZWYpW1tuYW1lIGNvcHld IGF1dG9yZWxlYXNlXSkgOiBudWxscHRyOworICAgIEpTU3RyaW5nUmVmIG5hbWVKUyA9IG5hbWUg PyBKU1N0cmluZ0NyZWF0ZVdpdGhDRlN0cmluZygoX19icmlkZ2UgQ0ZTdHJpbmdSZWYpbmFtZSkg OiBudWxscHRyOwogICAgIEpTR2xvYmFsQ29udGV4dFNldE5hbWUobV9jb250ZXh0LCBuYW1lSlMp OwogICAgIGlmIChuYW1lSlMpCiAgICAgICAgIEpTU3RyaW5nUmVsZWFzZShuYW1lSlMpOwpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvY29jb2EvUmVt b3RlSW5zcGVjdG9yQ29jb2EubW0gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Jl bW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbQppbmRleCBmY2FmNGFmMjI1ZTVlYzJl YmJmNmI1OWRjM2JiMTcwYmRkZDlkMDkzLi5iNzE2OTExNThmYzM4YWQyMTIxZTMxYTJhN2JhYTM0 OTdlYzAzNGYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Jl bW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbQorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbQpAQCAt NjI3LDcgKzYyNyw3IEBAIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjpyZWNlaXZlZFByb3h5QXBwbGlj YXRpb25TZXR1cE1lc3NhZ2UoTlNEaWN0aW9uYXJ5ICopCiAKICAgICBtX3JlbGF5Q29ubmVjdGlv bi0+c2VuZE1lc3NhZ2UoV0lSUHJveHlBcHBsaWNhdGlvblNldHVwUmVzcG9uc2VNZXNzYWdlLCBA ewogICAgICAgICBXSVJQcm94eUFwcGxpY2F0aW9uUGFyZW50UElES2V5OiBAKG1fcGFyZW50UHJv Y2Vzc0lkZW50aWZpZXIpLAotICAgICAgICBXSVJQcm94eUFwcGxpY2F0aW9uUGFyZW50QXVkaXRE YXRhS2V5OiAoTlNEYXRhICopbV9wYXJlbnRQcm9jZXNzQXVkaXREYXRhLmdldCgpLAorICAgICAg ICBXSVJQcm94eUFwcGxpY2F0aW9uUGFyZW50QXVkaXREYXRhS2V5OiAoX19icmlkZ2UgTlNEYXRh ICopbV9wYXJlbnRQcm9jZXNzQXVkaXREYXRhLmdldCgpLAogICAgIH0pOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJ bnNwZWN0b3JYUENDb25uZWN0aW9uLm1tIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9yZW1vdGUvY29jb2EvUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5tbQppbmRleCBjZjAw YmE3NWM2YmU0NDYxZjBmZDU2MTdkNDQ1MjRjNmY4NTc5NTJhLi5jZWE2YzljMWFmMWU2MDEwMmEx MjM0NWVjZjk4Njk5NDM1NmIwZTMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv aW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLm1tCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2NvY29hL1JlbW90ZUlu c3BlY3RvclhQQ0Nvbm5lY3Rpb24ubW0KQEAgLTE0MiwxMCArMTQyLDEwIEBAIE5TRGljdGlvbmFy eSAqUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbjo6ZGVzZXJpYWxpemVNZXNzYWdlKHhwY19v YmplY3RfdCBvYmplCiAgICAgICAgIHJldHVybiBuaWw7CiAgICAgfQogCi0gICAgUmV0YWluUHRy PENGRGljdGlvbmFyeVJlZj4gZGljdGlvbmFyeSA9IGFkb3B0Q0YoKENGRGljdGlvbmFyeVJlZilf Q0ZYUENDcmVhdGVDRk9iamVjdEZyb21YUENNZXNzYWdlKHhwY0RpY3Rpb25hcnkpKTsKKyAgICBh dXRvIGRpY3Rpb25hcnkgPSBfQ0ZYUENDcmVhdGVDRk9iamVjdEZyb21YUENNZXNzYWdlKHhwY0Rp Y3Rpb25hcnkpOwogICAgIEFTU0VSVF9XSVRIX01FU1NBR0UoZGljdGlvbmFyeSwgIlVuYWJsZSB0 byBkZXNlcmlhbGl6ZSB4cGMgbWVzc2FnZSIpOwotICAgIEFTU0VSVChDRkdldFR5cGVJRChkaWN0 aW9uYXJ5LmdldCgpKSA9PSBDRkRpY3Rpb25hcnlHZXRUeXBlSUQoKSk7Ci0gICAgcmV0dXJuIChO U0RpY3Rpb25hcnkgKilkaWN0aW9uYXJ5LmF1dG9yZWxlYXNlKCk7CisgICAgQVNTRVJUKENGR2V0 VHlwZUlEKGRpY3Rpb25hcnkpID09IENGRGljdGlvbmFyeUdldFR5cGVJRCgpKTsKKyAgICByZXR1 cm4gQ0ZCcmlkZ2luZ1JlbGVhc2UoZGljdGlvbmFyeSk7CiB9CiAKIHZvaWQgUmVtb3RlSW5zcGVj dG9yWFBDQ29ubmVjdGlvbjo6aGFuZGxlRXZlbnQoeHBjX29iamVjdF90IG9iamVjdCkK 341970 2018-06-05 08:53:01 -0700 2018-06-05 09:18:55 -0700 Patch bug-186301-20180605085300.patch text/plain 4889 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 MDJhOWNjZGYyYTU5YThjNWFkNWQ2YzZhMjBhMzU5ZWE2ODg4OGUxLi5jMzBjNmQzN2Y1YWM5NjBi MWZiYjEwOWE4YWFjY2I0MzgxMDY3YjMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxOC0wNi0wNSAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CisK KyAgICAgICAgW0NvY29hXSBVcGRhdGUgc29tZSBKYXZhU2NyaXB0Q29yZSBjb2RlIHRvIGJlIG1v cmUgcmVhZHkgZm9yIEFSQworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTg2MzAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBBUEkvSlNDb250ZXh0Lm1tOgorICAgICAgICAoLVtKU0NvbnRleHQgZXZhbHVh dGVTY3JpcHQ6d2l0aFNvdXJjZVVSTDpdKTogVXNlIF9fYnJpZGdlIGZvciB0eXBlY2FzdC4KKyAg ICAgICAgKC1bSlNDb250ZXh0IHNldE5hbWU6XSk6IFJlbW92ZWQgdW5uZWNlc3NhcnkgY2FsbCB0 byBjb3B5LCBzaW5jZSB0aGUKKyAgICAgICAgSlNTdHJpbmdDcmVhdGVXaXRoQ0ZTdHJpbmcgZnVu Y3Rpb24gYWxyZWFkeSByZWFkcyB0aGUgY2hhcmFjdGVycyBvdXQKKyAgICAgICAgb2YgdGhlIHN0 cmluZyBhbmQgZG9lcyBub3QgcmV0YWluIHRoZSBzdHJpbmcsIHNvIHRoZXJlIGlzIG5vIG5lZWQg dG8KKyAgICAgICAgbWFrZSBhbiBpbW11dGFibGUgY29weS4gQW5kIHVzZWQgX19icmlkZ2UgZm9y IHR5cGVjYXN0LgorICAgICAgICAqIGluc3BlY3Rvci9yZW1vdGUvY29jb2EvUmVtb3RlSW5zcGVj dG9yQ29jb2EubW06CisgICAgICAgIChJbnNwZWN0b3I6OlJlbW90ZUluc3BlY3Rvcjo6cmVjZWl2 ZWRQcm94eUFwcGxpY2F0aW9uU2V0dXBNZXNzYWdlKToKKyAgICAgICAgRGl0dG8uCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvcmVtb3RlL2NvY29hL1JlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24u bW06CisgICAgICAgIChJbnNwZWN0b3I6OlJlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb246OmRl c2VyaWFsaXplTWVzc2FnZSk6CisgICAgICAgIFVzZSBDRkJyaWRnaW5nUmVsZWFzZSBpbnN0ZWFk IG9mIGF1dG9yZWxlYXNlIGZvciBhIENGIGRpY3Rpb25hcnkgdGhhdAorICAgICAgICB3ZSByZXR1 cm4gYXMgYW4gTlNEaWN0aW9uYXJ5LgorCiAyMDE4LTA2LTA0ICBLZWl0aCBNaWxsZXIgIDxrZWl0 aF9taWxsZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBtaXNzaW5nIGZpbGVzIGZyb20g SmF2YVNjcmlwdENvcmUgWGNvZGUgcHJvamVjdApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL0FQSS9KU0NvbnRleHQubW0gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTQ29u dGV4dC5tbQppbmRleCBhZGI3ODAxMzhkODU3OTNhYzY5YzRjYzRiYWQ4ZmIyODhmNzMyMTM5Li5k OGIwYTc1NjJhMDM1ZjNmN2Q1NDQ0ZWUzYzJjYjg3ZjA3YzY5NzIzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTQ29udGV4dC5tbQorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQVBJL0pTQ29udGV4dC5tbQpAQCAtMTAwLDggKzEwMCw4IEBAIC0gKEpTVmFsdWUgKill dmFsdWF0ZVNjcmlwdDooTlNTdHJpbmcgKilzY3JpcHQKIC0gKEpTVmFsdWUgKilldmFsdWF0ZVNj cmlwdDooTlNTdHJpbmcgKilzY3JpcHQgd2l0aFNvdXJjZVVSTDooTlNVUkwgKilzb3VyY2VVUkwK IHsKICAgICBKU1ZhbHVlUmVmIGV4Y2VwdGlvblZhbHVlID0gbnVsbHB0cjsKLSAgICBKU1N0cmlu Z1JlZiBzY3JpcHRKUyA9IEpTU3RyaW5nQ3JlYXRlV2l0aENGU3RyaW5nKChDRlN0cmluZ1JlZilz Y3JpcHQpOwotICAgIEpTU3RyaW5nUmVmIHNvdXJjZVVSTEpTID0gc291cmNlVVJMID8gSlNTdHJp bmdDcmVhdGVXaXRoQ0ZTdHJpbmcoKENGU3RyaW5nUmVmKVtzb3VyY2VVUkwgYWJzb2x1dGVTdHJp bmddKSA6IG51bGxwdHI7CisgICAgSlNTdHJpbmdSZWYgc2NyaXB0SlMgPSBKU1N0cmluZ0NyZWF0 ZVdpdGhDRlN0cmluZygoX19icmlkZ2UgQ0ZTdHJpbmdSZWYpc2NyaXB0KTsKKyAgICBKU1N0cmlu Z1JlZiBzb3VyY2VVUkxKUyA9IHNvdXJjZVVSTCA/IEpTU3RyaW5nQ3JlYXRlV2l0aENGU3RyaW5n KChfX2JyaWRnZSBDRlN0cmluZ1JlZilbc291cmNlVVJMIGFic29sdXRlU3RyaW5nXSkgOiBudWxs cHRyOwogICAgIEpTVmFsdWVSZWYgcmVzdWx0ID0gSlNFdmFsdWF0ZVNjcmlwdChtX2NvbnRleHQs IHNjcmlwdEpTLCBudWxscHRyLCBzb3VyY2VVUkxKUywgMCwgJmV4Y2VwdGlvblZhbHVlKTsKICAg ICBpZiAoc291cmNlVVJMSlMpCiAgICAgICAgIEpTU3RyaW5nUmVsZWFzZShzb3VyY2VVUkxKUyk7 CkBAIC0yMDIsNyArMjAyLDcgQEAgLSAoTlNTdHJpbmcgKiluYW1lCiAKIC0gKHZvaWQpc2V0TmFt ZTooTlNTdHJpbmcgKiluYW1lCiB7Ci0gICAgSlNTdHJpbmdSZWYgbmFtZUpTID0gbmFtZSA/IEpT U3RyaW5nQ3JlYXRlV2l0aENGU3RyaW5nKChDRlN0cmluZ1JlZilbW25hbWUgY29weV0gYXV0b3Jl bGVhc2VdKSA6IG51bGxwdHI7CisgICAgSlNTdHJpbmdSZWYgbmFtZUpTID0gbmFtZSA/IEpTU3Ry aW5nQ3JlYXRlV2l0aENGU3RyaW5nKChfX2JyaWRnZSBDRlN0cmluZ1JlZiluYW1lKSA6IG51bGxw dHI7CiAgICAgSlNHbG9iYWxDb250ZXh0U2V0TmFtZShtX2NvbnRleHQsIG5hbWVKUyk7CiAgICAg aWYgKG5hbWVKUykKICAgICAgICAgSlNTdHJpbmdSZWxlYXNlKG5hbWVKUyk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNw ZWN0b3JDb2NvYS5tbSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2Nv Y29hL1JlbW90ZUluc3BlY3RvckNvY29hLm1tCmluZGV4IGZjYWY0YWYyMjVlNWVjMmViYmY2YjU5 ZGMzYmIxNzBiZGRkOWQwOTMuLmI3MTY5MTE1OGZjMzhhZDIxMjFlMzFhMmE3YmFhMzQ5N2VjMDM0 ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2Nv Y29hL1JlbW90ZUluc3BlY3RvckNvY29hLm1tCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9p bnNwZWN0b3IvcmVtb3RlL2NvY29hL1JlbW90ZUluc3BlY3RvckNvY29hLm1tCkBAIC02MjcsNyAr NjI3LDcgQEAgdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnJlY2VpdmVkUHJveHlBcHBsaWNhdGlvblNl dHVwTWVzc2FnZShOU0RpY3Rpb25hcnkgKikKIAogICAgIG1fcmVsYXlDb25uZWN0aW9uLT5zZW5k TWVzc2FnZShXSVJQcm94eUFwcGxpY2F0aW9uU2V0dXBSZXNwb25zZU1lc3NhZ2UsIEB7CiAgICAg ICAgIFdJUlByb3h5QXBwbGljYXRpb25QYXJlbnRQSURLZXk6IEAobV9wYXJlbnRQcm9jZXNzSWRl bnRpZmllciksCi0gICAgICAgIFdJUlByb3h5QXBwbGljYXRpb25QYXJlbnRBdWRpdERhdGFLZXk6 IChOU0RhdGEgKiltX3BhcmVudFByb2Nlc3NBdWRpdERhdGEuZ2V0KCksCisgICAgICAgIFdJUlBy b3h5QXBwbGljYXRpb25QYXJlbnRBdWRpdERhdGFLZXk6IChfX2JyaWRnZSBOU0RhdGEgKiltX3Bh cmVudFByb2Nlc3NBdWRpdERhdGEuZ2V0KCksCiAgICAgfSk7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2NvY29hL1JlbW90ZUluc3BlY3Rv clhQQ0Nvbm5lY3Rpb24ubW0gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90 ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLm1tCmluZGV4IGNmMDBiYTc1YzZi ZTQ0NjFmMGZkNTYxN2Q0NDUyNGM2Zjg1Nzk1MmEuLmNlYTZjOWMxYWYxZTYwMTAyYTEyMzQ1ZWNm OTg2OTk0MzU2YjBlMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvcmVtb3RlL2NvY29hL1JlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24ubW0KKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvY29jb2EvUmVtb3RlSW5zcGVjdG9y WFBDQ29ubmVjdGlvbi5tbQpAQCAtMTQyLDEwICsxNDIsMTAgQEAgTlNEaWN0aW9uYXJ5ICpSZW1v dGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpkZXNlcmlhbGl6ZU1lc3NhZ2UoeHBjX29iamVjdF90 IG9iamUKICAgICAgICAgcmV0dXJuIG5pbDsKICAgICB9CiAKLSAgICBSZXRhaW5QdHI8Q0ZEaWN0 aW9uYXJ5UmVmPiBkaWN0aW9uYXJ5ID0gYWRvcHRDRigoQ0ZEaWN0aW9uYXJ5UmVmKV9DRlhQQ0Ny ZWF0ZUNGT2JqZWN0RnJvbVhQQ01lc3NhZ2UoeHBjRGljdGlvbmFyeSkpOworICAgIGF1dG8gZGlj dGlvbmFyeSA9IF9DRlhQQ0NyZWF0ZUNGT2JqZWN0RnJvbVhQQ01lc3NhZ2UoeHBjRGljdGlvbmFy eSk7CiAgICAgQVNTRVJUX1dJVEhfTUVTU0FHRShkaWN0aW9uYXJ5LCAiVW5hYmxlIHRvIGRlc2Vy aWFsaXplIHhwYyBtZXNzYWdlIik7Ci0gICAgQVNTRVJUKENGR2V0VHlwZUlEKGRpY3Rpb25hcnku Z2V0KCkpID09IENGRGljdGlvbmFyeUdldFR5cGVJRCgpKTsKLSAgICByZXR1cm4gKE5TRGljdGlv bmFyeSAqKWRpY3Rpb25hcnkuYXV0b3JlbGVhc2UoKTsKKyAgICBBU1NFUlQoQ0ZHZXRUeXBlSUQo ZGljdGlvbmFyeSkgPT0gQ0ZEaWN0aW9uYXJ5R2V0VHlwZUlEKCkpOworICAgIHJldHVybiBDRkJy aWRnaW5nUmVsZWFzZShkaWN0aW9uYXJ5KTsKIH0KIAogdm9pZCBSZW1vdGVJbnNwZWN0b3JYUEND b25uZWN0aW9uOjpoYW5kbGVFdmVudCh4cGNfb2JqZWN0X3Qgb2JqZWN0KQo=