143312 2015-04-01 11:46:53 -0700 [iOS] WebContent should have access to the entirety of its caches directory 2015-04-01 15:51:56 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap oliver oldest_to_newest 1082066 0 ap 2015-04-01 11:46:53 -0700 WebContent process has its own caches directory, so it's silly to further limit access to its subdirectories only. Whenever there is something in lower level frameworks that wants to have a cache, we need to do extra work to allow that. rdar://problem/20314916 1082067 1 249936 ap 2015-04-01 11:50:05 -0700 Created attachment 249936 proposed patch 1082068 2 249936 oliver 2015-04-01 11:52:06 -0700 Comment on attachment 249936 proposed patch looks good to me -- r=me if you want it :D 1082076 3 ap 2015-04-01 12:06:51 -0700 Waiting for EWS, as I didn't attempt to compile locally :-D 1082134 4 ap 2015-04-01 15:51:56 -0700 Committed <http://trac.webkit.org/r182259>. 249936 2015-04-01 11:50:05 -0700 2015-04-01 11:50:05 -0700 proposed patch iOSLibraryCaches.txt text/plain 12613 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjI0NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDE1LTA0LTAxICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFdlYkNvbnRlbnQg c2hvdWxkIGhhdmUgYWNjZXNzIHRvIHRoZSBlbnRpcmV0eSBvZiBpdHMgY2FjaGVzIGRpcmVjdG9y eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzMzEy CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzIwMzE0OTE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3Jr UHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6cGxhdGZv cm1Jbml0aWFsaXplTmV0d29ya1Byb2Nlc3NDb2NvYSk6CisgICAgICAgICogU2hhcmVkL05ldHdv cmsvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0 OjpOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKToKKyAgICAgICAgKFdl YktpdDo6TmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAg ICogU2hhcmVkL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAg ICAgICAgKiBTaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSk6CisgICAgICAg IChXZWJLaXQ6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAg ICogU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzc1Bvb2w6Om5ldHdvcmtpbmdDYWNoZXNEaXJlY3RvcnkpOgorICAgICAgICAoV2ViS2l0 OjpXZWJQcm9jZXNzUG9vbDo6d2ViQ29udGVudENhY2hlc0RpcmVjdG9yeSk6CisgICAgICAgIChX ZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpvcGVuR0xDYWNoZURpcmVjdG9yeSk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpuZXR3b3JraW5nSFNUU0RhdGFiYXNlUGF0 aCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjp3ZWJDb250ZW50 SFNUU0RhdGFiYXNlUGF0aCk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nl c3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmVuc3VyZU5ldHdv cmtQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmNyZWF0ZU5ld1dl YlByb2Nlc3MpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oOgorICAgICAg ICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0 OjpXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKwogMjAxNS0wMy0z MSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1v dmUgc2Nyb2xsaW5nIHRyZWUgZGVwZW5kZW5jeSBvbiB3aGVlbCBldmVudCBoYW5kbGVyIGNvdW50 cywgYW5kIHVzZSBmYXN0IHNjcm9sbGluZyBldmVuIHdoZW4gdGhlcmUgYXJlIHdoZWVsIGhhbmRs ZXJzCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrUHJv Y2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L2NvY29hL05ldHdvcmtQcm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDE4MjIxMSkKKysrIFNvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtQcm9jZXNzQ29jb2EubW0JKHdv cmtpbmcgY29weSkKQEAgLTQ5LDcgKzQ5LDcgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6cGxhdGZv cm1Jbml0aWFsaXplTgogewogI2lmIFBMQVRGT1JNKElPUykKICAgICBTYW5kYm94RXh0ZW5zaW9u Ojpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5jb29raWVTdG9yYWdlRGlyZWN0b3J5RXh0 ZW5zaW9uSGFuZGxlKTsKLSAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHko cGFyYW1ldGVycy5oc3RzRGF0YWJhc2VQYXRoRXh0ZW5zaW9uSGFuZGxlKTsKKyAgICBTYW5kYm94 RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5jb250YWluZXJDYWNoZXNE aXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwogICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQ ZXJtYW5lbnRseShwYXJhbWV0ZXJzLnBhcmVudEJ1bmRsZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRs ZSk7CiAjZW5kaWYKICAgICBtX2Rpc2tDYWNoZURpcmVjdG9yeSA9IHBhcmFtZXRlcnMuZGlza0Nh Y2hlRGlyZWN0b3J5OwpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9X ZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkocmV2aXNpb24gMTgyMjExKQorKysgU291 cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC03Niw5ICs3Niw4IEBAIHZvaWQgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1l dGVyczo6ZW5jb2QKICAgICBlbmNvZGVyIDw8IGNvb2tpZVN0b3JhZ2VEaXJlY3Rvcnk7CiAjaWYg UExBVEZPUk0oSU9TKQogICAgIGVuY29kZXIgPDwgY29va2llU3RvcmFnZURpcmVjdG9yeUV4dGVu c2lvbkhhbmRsZTsKLSAgICBlbmNvZGVyIDw8IG9wZW5HTENhY2hlRGlyZWN0b3J5RXh0ZW5zaW9u SGFuZGxlOworICAgIGVuY29kZXIgPDwgY29udGFpbmVyQ2FjaGVzRGlyZWN0b3J5RXh0ZW5zaW9u SGFuZGxlOwogICAgIGVuY29kZXIgPDwgY29udGFpbmVyVGVtcG9yYXJ5RGlyZWN0b3J5RXh0ZW5z aW9uSGFuZGxlOwotICAgIGVuY29kZXIgPDwgaHN0c0RhdGFiYXNlUGF0aEV4dGVuc2lvbkhhbmRs ZTsKICNlbmRpZgogICAgIGVuY29kZXIgPDwgbWVkaWFLZXlTdG9yYWdlRGlyZWN0b3J5OwogICAg IGVuY29kZXIgPDwgbWVkaWFLZXlTdG9yYWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwpAQCAt MTgyLDEyICsxODEsMTAgQEAgYm9vbCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNv ZAogI2lmIFBMQVRGT1JNKElPUykKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMu Y29va2llU3RvcmFnZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSkpCiAgICAgICAgIHJldHVybiBm YWxzZTsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMub3BlbkdMQ2FjaGVEaXJl Y3RvcnlFeHRlbnNpb25IYW5kbGUpKQorICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVy cy5jb250YWluZXJDYWNoZXNEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpKQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmNvbnRhaW5lclRl bXBvcmFyeURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuaHN0c0RhdGFiYXNlUGF0aEV4dGVu c2lvbkhhbmRsZSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgogICAgIGlmICghZGVj b2Rlci5kZWNvZGUocGFyYW1ldGVycy5tZWRpYUtleVN0b3JhZ2VEaXJlY3RvcnkpKQogICAgICAg ICByZXR1cm4gZmFsc2U7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0Ny ZWF0aW9uUGFyYW1ldGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9X ZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHJldmlzaW9uIDE4MjIxMSkKKysrIFNvdXJj ZS9XZWJLaXQyL1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHdvcmtpbmcg Y29weSkKQEAgLTc3LDEwICs3Nyw4IEBAIHN0cnVjdCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0 ZXJzIHsKICAgICBTdHJpbmcgY29va2llU3RvcmFnZURpcmVjdG9yeTsKICNpZiBQTEFURk9STShJ T1MpCiAgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIGNvb2tpZVN0b3JhZ2VEaXJlY3RvcnlF eHRlbnNpb25IYW5kbGU7Ci0gICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIG9wZW5HTENhY2hl RGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOworICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBj b250YWluZXJDYWNoZXNEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGU7CiAgICAgU2FuZGJveEV4dGVu c2lvbjo6SGFuZGxlIGNvbnRhaW5lclRlbXBvcmFyeURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZTsK LSAgICAvLyBGSVhNRTogUmVtb3ZlIHRoaXMgb25jZSA8cmRhcjovL3Byb2JsZW0vMTc3MjY2NjA+ IGlzIGZpeGVkLgotICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBoc3RzRGF0YWJhc2VQYXRo RXh0ZW5zaW9uSGFuZGxlOwogI2VuZGlmCiAgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIG1l ZGlhS2V5U3RvcmFnZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZTsKICAgICBTdHJpbmcgbWVkaWFL ZXlTdG9yYWdlRGlyZWN0b3J5OwpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsv TmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJz LmNwcAkocmV2aXNpb24gMTgyMjExKQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsv TmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01 NSw3ICs1NSw3IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmUKICAg ICBlbmNvZGVyIDw8IGNvb2tpZVN0b3JhZ2VEaXJlY3Rvcnk7CiAjaWYgUExBVEZPUk0oSU9TKQog ICAgIGVuY29kZXIgPDwgY29va2llU3RvcmFnZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZTsKLSAg ICBlbmNvZGVyIDw8IGhzdHNEYXRhYmFzZVBhdGhFeHRlbnNpb25IYW5kbGU7CisgICAgZW5jb2Rl ciA8PCBjb250YWluZXJDYWNoZXNEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGU7CiAgICAgZW5jb2Rl ciA8PCBwYXJlbnRCdW5kbGVEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGU7CiAjZW5kaWYKICAgICBl bmNvZGVyIDw8IHNob3VsZFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbjsKQEAgLTEwNSw3ICsxMDUs NyBAQCBib29sIE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkCiAjaWYgUExBVEZP Uk0oSU9TKQogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmNvb2tpZVN0b3JhZ2VEaXJl Y3RvcnlFeHRlbnNpb25IYW5kbGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYgKCFk ZWNvZGVyLmRlY29kZShyZXN1bHQuaHN0c0RhdGFiYXNlUGF0aEV4dGVuc2lvbkhhbmRsZSkpCisg ICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuY29udGFpbmVyQ2FjaGVzRGlyZWN0b3J5RXh0 ZW5zaW9uSGFuZGxlKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5k ZWNvZGUocmVzdWx0LnBhcmVudEJ1bmRsZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05l dHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAko cmV2aXNpb24gMTgyMjExKQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29y a1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAkod29ya2luZyBjb3B5KQpAQCAtNjcsOCArNjcs NyBAQCBzdHJ1Y3QgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgCiAjaWYgUExBVEZP Uk0oSU9TKQogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBjb29raWVTdG9yYWdlRGlyZWN0 b3J5RXh0ZW5zaW9uSGFuZGxlOwogCi0gICAgLy8gRklYTUU6IFJlbW92ZSB0aGlzIG9uY2UgPHJk YXI6Ly9wcm9ibGVtLzE3NzI2NjYwPiBpcyBmaXhlZC4KLSAgICBTYW5kYm94RXh0ZW5zaW9uOjpI YW5kbGUgaHN0c0RhdGFiYXNlUGF0aEV4dGVuc2lvbkhhbmRsZTsKKyAgICBTYW5kYm94RXh0ZW5z aW9uOjpIYW5kbGUgY29udGFpbmVyQ2FjaGVzRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwogCiAg ICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIHBhcmVudEJ1bmRsZURpcmVjdG9yeUV4dGVuc2lv bkhhbmRsZTsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nl c3NQb29sLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Bvb2wuY3BwCShyZXZpc2lvbiAxODIyMTEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MTcsOSArNDE3LDkgQEAg TmV0d29ya1Byb2Nlc3NQcm94eSYgV2ViUHJvY2Vzc1Bvb2w6OmVucwogICAgIGlmICghcGFyYW1l dGVycy5jb29raWVTdG9yYWdlRGlyZWN0b3J5LmlzRW1wdHkoKSkKICAgICAgICAgU2FuZGJveEV4 dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yUmVhZFdyaXRlRGlyZWN0b3J5KHBhcmFtZXRlcnMuY29v a2llU3RvcmFnZURpcmVjdG9yeSwgcGFyYW1ldGVycy5jb29raWVTdG9yYWdlRGlyZWN0b3J5RXh0 ZW5zaW9uSGFuZGxlKTsKIAotICAgIFN0cmluZyBoc3RzRGF0YWJhc2VQYXRoID0gbmV0d29ya2lu Z0hTVFNEYXRhYmFzZVBhdGgoKTsKLSAgICBpZiAoIWhzdHNEYXRhYmFzZVBhdGguaXNFbXB0eSgp KQotICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGUoaHN0c0RhdGFiYXNlUGF0 aCwgU2FuZGJveEV4dGVuc2lvbjo6UmVhZFdyaXRlLCBwYXJhbWV0ZXJzLmhzdHNEYXRhYmFzZVBh dGhFeHRlbnNpb25IYW5kbGUpOworICAgIFN0cmluZyBjb250YWluZXJDYWNoZXNEaXJlY3Rvcnkg PSB0aGlzLT5uZXR3b3JraW5nQ2FjaGVzRGlyZWN0b3J5KCk7CisgICAgaWYgKCFjb250YWluZXJD YWNoZXNEaXJlY3RvcnkuaXNFbXB0eSgpKQorICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVh dGVIYW5kbGVGb3JSZWFkV3JpdGVEaXJlY3RvcnkoY29udGFpbmVyQ2FjaGVzRGlyZWN0b3J5LCBw YXJhbWV0ZXJzLmNvbnRhaW5lckNhY2hlc0RpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CiAKICAg ICBTdHJpbmcgcGFyZW50QnVuZGxlRGlyZWN0b3J5ID0gdGhpcy0+cGFyZW50QnVuZGxlRGlyZWN0 b3J5KCk7CiAgICAgaWYgKCFwYXJlbnRCdW5kbGVEaXJlY3RvcnkuaXNFbXB0eSgpKQpAQCAtNjE2 LDE3ICs2MTYsMTMgQEAgV2ViUHJvY2Vzc1Byb3h5JiBXZWJQcm9jZXNzUG9vbDo6Y3JlYXRlTgog ICAgIGlmICghcGFyYW1ldGVycy5jb29raWVTdG9yYWdlRGlyZWN0b3J5LmlzRW1wdHkoKSkKICAg ICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yUmVhZFdyaXRlRGlyZWN0b3J5 KHBhcmFtZXRlcnMuY29va2llU3RvcmFnZURpcmVjdG9yeSwgcGFyYW1ldGVycy5jb29raWVTdG9y YWdlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKIAotICAgIFN0cmluZyBvcGVuR0xDYWNoZURp cmVjdG9yeSA9IHRoaXMtPm9wZW5HTENhY2hlRGlyZWN0b3J5KCk7Ci0gICAgaWYgKCFvcGVuR0xD YWNoZURpcmVjdG9yeS5pc0VtcHR5KCkpCi0gICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0 ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9yeShvcGVuR0xDYWNoZURpcmVjdG9yeSwgcGFyYW1l dGVycy5vcGVuR0xDYWNoZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CisgICAgU3RyaW5nIGNv bnRhaW5lckNhY2hlc0RpcmVjdG9yeSA9IHRoaXMtPndlYkNvbnRlbnRDYWNoZXNEaXJlY3Rvcnko KTsKKyAgICBpZiAoIWNvbnRhaW5lckNhY2hlc0RpcmVjdG9yeS5pc0VtcHR5KCkpCisgICAgICAg IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9yeShjb250 YWluZXJDYWNoZXNEaXJlY3RvcnksIHBhcmFtZXRlcnMuY29udGFpbmVyQ2FjaGVzRGlyZWN0b3J5 RXh0ZW5zaW9uSGFuZGxlKTsKIAogICAgIFN0cmluZyBjb250YWluZXJUZW1wb3JhcnlEaXJlY3Rv cnkgPSB0aGlzLT5jb250YWluZXJUZW1wb3JhcnlEaXJlY3RvcnkoKTsKICAgICBpZiAoIWNvbnRh aW5lclRlbXBvcmFyeURpcmVjdG9yeS5pc0VtcHR5KCkpCiAgICAgICAgIFNhbmRib3hFeHRlbnNp b246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9yeShjb250YWluZXJUZW1wb3JhcnlE aXJlY3RvcnksIHBhcmFtZXRlcnMuY29udGFpbmVyVGVtcG9yYXJ5RGlyZWN0b3J5RXh0ZW5zaW9u SGFuZGxlKTsKLQotICAgIFN0cmluZyBoc3RzRGF0YWJhc2VQYXRoID0gd2ViQ29udGVudEhTVFNE YXRhYmFzZVBhdGgoKTsKLSAgICBpZiAoIWhzdHNEYXRhYmFzZVBhdGguaXNFbXB0eSgpKQotICAg ICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGUoaHN0c0RhdGFiYXNlUGF0aCwgU2Fu ZGJveEV4dGVuc2lvbjo6UmVhZFdyaXRlLCBwYXJhbWV0ZXJzLmhzdHNEYXRhYmFzZVBhdGhFeHRl bnNpb25IYW5kbGUpOwogI2VuZGlmCiAKICAgICBwYXJhbWV0ZXJzLm1lZGlhS2V5U3RvcmFnZURp cmVjdG9yeSA9IG1fbWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeTsKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCShyZXZpc2lvbiAxODIyMTEpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAkod29ya2luZyBjb3B5KQpAQCAt NDAyLDEwICs0MDIsOSBAQCBwcml2YXRlOgogICAgIFN0cmluZyBwbGF0Zm9ybURlZmF1bHRDb29r aWVTdG9yYWdlRGlyZWN0b3J5KCkgY29uc3Q7CiAKICNpZiBQTEFURk9STShJT1MpCi0gICAgU3Ry aW5nIG9wZW5HTENhY2hlRGlyZWN0b3J5KCkgY29uc3Q7CiAgICAgU3RyaW5nIHBhcmVudEJ1bmRs ZURpcmVjdG9yeSgpIGNvbnN0OwotICAgIFN0cmluZyBuZXR3b3JraW5nSFNUU0RhdGFiYXNlUGF0 aCgpIGNvbnN0OwotICAgIFN0cmluZyB3ZWJDb250ZW50SFNUU0RhdGFiYXNlUGF0aCgpIGNvbnN0 OworICAgIFN0cmluZyBuZXR3b3JraW5nQ2FjaGVzRGlyZWN0b3J5KCkgY29uc3Q7CisgICAgU3Ry aW5nIHdlYkNvbnRlbnRDYWNoZXNEaXJlY3RvcnkoKSBjb25zdDsKICAgICBTdHJpbmcgY29udGFp bmVyVGVtcG9yYXJ5RGlyZWN0b3J5KCkgY29uc3Q7CiAjZW5kaWYKIApJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0J KHJldmlzaW9uIDE4MjIxMSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJQ cm9jZXNzUG9vbENvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yOTUsMjIgKzI5NSwxMiBAQCBT dHJpbmcgV2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtRGVmYXVsdENvCiB9CiAKICNpZiBQTEFURk9S TShJT1MpCi1TdHJpbmcgV2ViUHJvY2Vzc1Bvb2w6Om9wZW5HTENhY2hlRGlyZWN0b3J5KCkgY29u c3QKLXsKLSAgICBTdHJpbmcgcGF0aCA9IHBhdGhGb3JQcm9jZXNzQ29udGFpbmVyKCk7Ci0gICAg aWYgKHBhdGguaXNFbXB0eSgpKQotICAgICAgICBwYXRoID0gTlNIb21lRGlyZWN0b3J5KCk7Ci0K LSAgICBwYXRoID0gcGF0aCArICIvTGlicmFyeS9DYWNoZXMvY29tLmFwcGxlLldlYktpdC5XZWJD b250ZW50L2NvbS5hcHBsZS5vcGVuZ2wvIjsKLSAgICByZXR1cm4gc3RyaW5nQnlSZXNvbHZpbmdT eW1saW5rc0luUGF0aChwYXRoKTsKLX0KLQogU3RyaW5nIFdlYlByb2Nlc3NQb29sOjpwYXJlbnRC dW5kbGVEaXJlY3RvcnkoKSBjb25zdAogewogICAgIHJldHVybiBbW1tOU0J1bmRsZSBtYWluQnVu ZGxlXSBidW5kbGVQYXRoXSBzdHJpbmdCeVN0YW5kYXJkaXppbmdQYXRoXTsKIH0KIAotU3RyaW5n IFdlYlByb2Nlc3NQb29sOjpuZXR3b3JraW5nSFNUU0RhdGFiYXNlUGF0aCgpIGNvbnN0CitTdHJp bmcgV2ViUHJvY2Vzc1Bvb2w6Om5ldHdvcmtpbmdDYWNoZXNEaXJlY3RvcnkoKSBjb25zdAogewog ICAgIFN0cmluZyBwYXRoID0gcGF0aEZvclByb2Nlc3NDb250YWluZXIoKTsKICAgICBpZiAocGF0 aC5pc0VtcHR5KCkpCkBAIC0zMjYsMTAgKzMxNiwxMCBAQCBTdHJpbmcgV2ViUHJvY2Vzc1Bvb2w6 Om5ldHdvcmtpbmdIU1RTRGF0CiAgICAgICAgIHJldHVybiBTdHJpbmcoKTsKICAgICB9CiAKLSAg ICByZXR1cm4gcGF0aCArICIvSFNUUy5wbGlzdCI7CisgICAgcmV0dXJuIHBhdGg7CiB9CiAKLVN0 cmluZyBXZWJQcm9jZXNzUG9vbDo6d2ViQ29udGVudEhTVFNEYXRhYmFzZVBhdGgoKSBjb25zdAor U3RyaW5nIFdlYlByb2Nlc3NQb29sOjp3ZWJDb250ZW50Q2FjaGVzRGlyZWN0b3J5KCkgY29uc3QK IHsKICAgICBTdHJpbmcgcGF0aCA9IHBhdGhGb3JQcm9jZXNzQ29udGFpbmVyKCk7CiAgICAgaWYg KHBhdGguaXNFbXB0eSgpKQpAQCAtMzQ1LDcgKzMzNSw3IEBAIFN0cmluZyBXZWJQcm9jZXNzUG9v bDo6d2ViQ29udGVudEhTVFNEYXQKICAgICAgICAgcmV0dXJuIFN0cmluZygpOwogICAgIH0KIAot ICAgIHJldHVybiBwYXRoICsgIi9IU1RTLnBsaXN0IjsKKyAgICByZXR1cm4gcGF0aDsKIH0KIAog U3RyaW5nIFdlYlByb2Nlc3NQb29sOjpjb250YWluZXJUZW1wb3JhcnlEaXJlY3RvcnkoKSBjb25z dApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2Eu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9j ZXNzQ29jb2EubW0JKHJldmlzaW9uIDE4MjIxMSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNjIsOSArMTYy LDggQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogICAgIFNhbmRi b3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShwYXJhbWV0ZXJzLm1lZGlhS2V5U3RvcmFn ZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CiAjaWYgUExBVEZPUk0oSU9TKQogICAgIFNhbmRi b3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShwYXJhbWV0ZXJzLmNvb2tpZVN0b3JhZ2VE aXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwotICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQ ZXJtYW5lbnRseShwYXJhbWV0ZXJzLm9wZW5HTENhY2hlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxl KTsKKyAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5j b250YWluZXJDYWNoZXNEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwogICAgIFNhbmRib3hFeHRl bnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShwYXJhbWV0ZXJzLmNvbnRhaW5lclRlbXBvcmFyeURp cmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7Ci0gICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBl cm1hbmVudGx5KHBhcmFtZXRlcnMuaHN0c0RhdGFiYXNlUGF0aEV4dGVuc2lvbkhhbmRsZSk7CiAj ZW5kaWYKICNlbmRpZgogCg==