87174 2012-05-22 15:22:03 -0700 [WK2] Let the client give local files universal access on a case by case basis 2012-05-24 11:45:42 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap abarth japhet webkit.review.bot oldest_to_newest 630819 0 ap 2012-05-22 15:22:03 -0700 Even when universal access from file URLs is not allowed with a preference, we may want to give it to specific safe files. The logic would be highly client specific, so it's best to have a callback. <rdar://problem/11024330> 630825 1 143378 ap 2012-05-22 15:28:51 -0700 Created attachment 143378 proposed patch 630827 2 143378 abarth 2012-05-22 15:34:17 -0700 Comment on attachment 143378 proposed patch Document.cpp changes look fine. 630865 3 143378 webkit-ews 2012-05-22 15:59:01 -0700 Comment on attachment 143378 proposed patch Attachment 143378 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12770014 632269 4 143378 mjs 2012-05-23 18:12:29 -0700 Comment on attachment 143378 proposed patch r=me 633014 5 ap 2012-05-24 11:45:42 -0700 Committed <http://trac.webkit.org/changeset/118397>. 143378 2012-05-22 15:28:51 -0700 2012-05-23 18:12:29 -0700 proposed patch Indulgence.txt text/plain 11542 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExODA2MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA1LTIyICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIExldCB0aGUgY2xp ZW50IGdpdmUgbG9jYWwgZmlsZXMgdW5pdmVyc2FsIGFjY2VzcyBvbiBhIGNhc2UgYnkgY2FzZSBi YXNpcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODcx NzQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzExMDI0MzMwPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDogKFdlYkNv cmU6OkRvY3VtZW50Ojppbml0U2VjdXJpdHlDb250ZXh0KTogV2hlbiBzZXR0aW5ncy0+YWxsb3dV bml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMoKQorICAgICAgICBpcyBmYWxzZSwgYWxzbyB0cnkg YXNraW5nIHRoZSBjbGllbnQgZm9yIGFuIGluZHVsZ2VuY2UuCisKKyAgICAgICAgKiBsb2FkZXIv RnJhbWVMb2FkZXJDbGllbnQuaDogKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50OjpzaG91bGRG b3JjZVVuaXZlcnNhbEFjY2Vzc0Zyb21Mb2NhbFVSTCk6CisgICAgICAgIERlZmF1bHQgaW1wbGVt ZW50YXRpb24gZG9lc24ndCBjaGFuZ2UgYW55dGhpbmcuCisKIDIwMTItMDUtMjIgIE1hcnRpbiBS b2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtUZXh0dXJlTWFwcGVy XSBbQ2Fpcm9dIEltcGxlbWVudCByZXBhaW50IGNvdW50ZXJzCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9kb20vRG9jdW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAJKHJldmlzaW9uIDExNzUxNCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ5NzIsMjAgKzQ5NzIsMTkgQEAgdm9pZCBEb2N1bWVu dDo6aW5pdFNlY3VyaXR5Q29udGV4dCgpCiAKICAgICBpZiAoU2V0dGluZ3MqIHNldHRpbmdzID0g dGhpcy0+c2V0dGluZ3MoKSkgewogICAgICAgICBpZiAoIXNldHRpbmdzLT5pc1dlYlNlY3VyaXR5 RW5hYmxlZCgpKSB7Ci0gICAgICAgICAgICAvLyBXZWIgc2VjdXJpdHkgaXMgdHVybmVkIG9mZi4g V2Ugc2hvdWxkIGxldCB0aGlzIGRvY3VtZW50IGFjY2VzcyBldmVyeQotICAgICAgICAgICAgLy8g b3RoZXIgZG9jdW1lbnQuIFRoaXMgaXMgdXNlZCBwcmltYXJ5IGJ5IHRlc3RpbmcgaGFybmVzc2Vz IGZvciB3ZWIKLSAgICAgICAgICAgIC8vIHNpdGVzLgorICAgICAgICAgICAgLy8gV2ViIHNlY3Vy aXR5IGlzIHR1cm5lZCBvZmYuIFdlIHNob3VsZCBsZXQgdGhpcyBkb2N1bWVudCBhY2Nlc3MgZXZl cnkgb3RoZXIgZG9jdW1lbnQuIFRoaXMgaXMgdXNlZCBwcmltYXJ5IGJ5IHRlc3RpbmcKKyAgICAg ICAgICAgIC8vIGhhcm5lc3NlcyBmb3Igd2ViIHNpdGVzLgogICAgICAgICAgICAgc2VjdXJpdHlP cmlnaW4oKS0+Z3JhbnRVbml2ZXJzYWxBY2Nlc3MoKTsKLSAgICAgICAgfSBlbHNlIGlmIChzZXR0 aW5ncy0+YWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMoKSAmJiBzZWN1cml0eU9yaWdp bigpLT5pc0xvY2FsKCkpIHsKLSAgICAgICAgICAgIC8vIFNvbWUgY2xpZW50cyB3YW50IGZpbGU6 Ly8gVVJMcyB0byBoYXZlIHVuaXZlcnNhbCBhY2Nlc3MsIGJ1dCB0aGF0Ci0gICAgICAgICAgICAv LyBzZXR0aW5nIGlzIGRhbmdlcm91cyBmb3Igb3RoZXIgY2xpZW50cy4KLSAgICAgICAgICAgIHNl Y3VyaXR5T3JpZ2luKCktPmdyYW50VW5pdmVyc2FsQWNjZXNzKCk7Ci0gICAgICAgIH0gZWxzZSBp ZiAoIXNldHRpbmdzLT5hbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMoKSAmJiBzZWN1cml0eU9y aWdpbigpLT5pc0xvY2FsKCkpIHsKLSAgICAgICAgICAgIC8vIFNvbWUgY2xpZW50cyB3YW50IGZp bGU6Ly8gVVJMcyB0byBoYXZlIGV2ZW4gdGlnaHRlciByZXN0cmljdGlvbnMgYnkKLSAgICAgICAg ICAgIC8vIGRlZmF1bHQsIGFuZCBub3QgYmUgYWJsZSB0byBhY2Nlc3Mgb3RoZXIgbG9jYWwgZmls ZXMuCi0gICAgICAgICAgICAvLyBGSVhNRSA4MTU3ODogVGhlIG5hbWluZyBvZiB0aGlzIGlzIGNv bmZ1c2luZy4gRmlsZXMgd2l0aCByZXN0cmljdGVkIGFjY2VzcyB0byBvdGhlciBsb2NhbCBmaWxl cwotICAgICAgICAgICAgLy8gc3RpbGwgY2FuIGhhdmUgb3RoZXIgcHJpdmlsZWdlcyB0aGF0IGNh biBiZSByZW1lbWJlcmVkLCB0aGVyZWJ5IG5vdCBtYWtpbmcgdGhlbSB1bmlxdWUgb3JpZ2lucy4K LSAgICAgICAgICAgIHNlY3VyaXR5T3JpZ2luKCktPmVuZm9yY2VGaWxlUGF0aFNlcGFyYXRpb24o KTsKKyAgICAgICAgfSBlbHNlIGlmIChzZWN1cml0eU9yaWdpbigpLT5pc0xvY2FsKCkpIHsKKyAg ICAgICAgICAgIGlmIChzZXR0aW5ncy0+YWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMo KSB8fCBtX2ZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCktPnNob3VsZEZvcmNlVW5pdmVyc2FsQWNj ZXNzRnJvbUxvY2FsVVJMKG1fdXJsKSkgeworICAgICAgICAgICAgICAgIC8vIFNvbWUgY2xpZW50 cyB3YW50IGxvY2FsIFVSTHMgdG8gaGF2ZSB1bml2ZXJzYWwgYWNjZXNzLCBidXQgdGhhdCBzZXR0 aW5nIGlzIGRhbmdlcm91cyBmb3Igb3RoZXIgY2xpZW50cy4KKyAgICAgICAgICAgICAgICBzZWN1 cml0eU9yaWdpbigpLT5ncmFudFVuaXZlcnNhbEFjY2VzcygpOworICAgICAgICAgICAgfSBlbHNl IGlmICghc2V0dGluZ3MtPmFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcygpKSB7CisgICAgICAg ICAgICAgICAgLy8gU29tZSBjbGllbnRzIHdhbnQgbG9jYWwgVVJMcyB0byBoYXZlIGV2ZW4gdGln aHRlciByZXN0cmljdGlvbnMgYnkgZGVmYXVsdCwgYW5kIG5vdCBiZSBhYmxlIHRvIGFjY2VzcyBv dGhlciBsb2NhbCBmaWxlcy4KKyAgICAgICAgICAgICAgICAvLyBGSVhNRSA4MTU3ODogVGhlIG5h bWluZyBvZiB0aGlzIGlzIGNvbmZ1c2luZy4gRmlsZXMgd2l0aCByZXN0cmljdGVkIGFjY2VzcyB0 byBvdGhlciBsb2NhbCBmaWxlcworICAgICAgICAgICAgICAgIC8vIHN0aWxsIGNhbiBoYXZlIG90 aGVyIHByaXZpbGVnZXMgdGhhdCBjYW4gYmUgcmVtZW1iZXJlZCwgdGhlcmVieSBub3QgbWFraW5n IHRoZW0gdW5pcXVlIG9yaWdpbnMuCisgICAgICAgICAgICAgICAgc2VjdXJpdHlPcmlnaW4oKS0+ ZW5mb3JjZUZpbGVQYXRoU2VwYXJhdGlvbigpOworICAgICAgICAgICAgfQogICAgICAgICB9CiAg ICAgfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAko cmV2aXNpb24gMTE3NTE0KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xp ZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTMyMCw2ICszMjAsOSBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIC8vIFRoaXMgY2FsbGJhY2sgaXMgc2ltaWxhciwgYnV0IGZvciBwbHVnaW5z LgogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkTm90QWxsb3dQbHVnaW5zKCkgeyB9CiAKKyAgICAg ICAgLy8gQ2xpZW50cyB0aGF0IGdlbmVyYWxseSBkaXNhbGxvdyB1bml2ZXJzYWwgYWNjZXNzIGNh biBtYWtlIGV4Y2VwdGlvbnMgZm9yIHBhcnRpY3VsYXIgVVJMcy4KKyAgICAgICAgdmlydHVhbCBi b29sIHNob3VsZEZvcmNlVW5pdmVyc2FsQWNjZXNzRnJvbUxvY2FsVVJMKGNvbnN0IEtVUkwmKSB7 IHJldHVybiBmYWxzZTsgfQorCiAgICAgICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxGcmFtZU5ldHdv cmtpbmdDb250ZXh0PiBjcmVhdGVOZXR3b3JraW5nQ29udGV4dCgpID0gMDsKIAogICAgICAgICB2 aXJ0dWFsIGJvb2wgc2hvdWxkUGFpbnRCcm9rZW5JbWFnZShjb25zdCBLVVJMJikgY29uc3QgeyBy ZXR1cm4gdHJ1ZTsgfQpJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gMTE4MDYyKQorKysgU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTIt MDUtMjIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgW1dL Ml0gTGV0IHRoZSBjbGllbnQgZ2l2ZSBsb2NhbCBmaWxlcyB1bml2ZXJzYWwgYWNjZXNzIG9uIGEg Y2FzZSBieSBjYXNlIGJhc2lzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04NzE3NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTEwMjQzMzA+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nl c3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50OjpzaG91bGRGb3Jj ZVVuaXZlcnNhbEFjY2Vzc0Zyb21Mb2NhbFVSTCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9Jbmpl Y3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuaDoKKyAgICAgICAgKElu amVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YkZyYW1lTG9hZGVyQ2xpZW50OjpzaG91bGRGb3JjZVVuaXZlcnNhbEFjY2Vzc0Zyb21Mb2NhbFVS TCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNs aWVudC5oOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQpOgorICAgICAgICBBZGRlZCBn bHVlIGNvZGUgdG8gY2FsbCBidW5kbGUgY2xpZW50LgorCiAyMDEyLTA1LTIyICBBbmRlcnMgQ2Fy bHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2ggd2hlbiBhIHBsdWct aW4gdmlldyBvdXRsaXZlcyBpdHMgY29udGFpbmluZyBXZWJQYWdlCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZUxvYWRlckNs aWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3Rl ZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuY3BwCShyZXZpc2lvbiAxMTc1 MTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVk QnVuZGxlUGFnZUxvYWRlckNsaWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5Niw0ICsyOTYs MTIgQEAgdm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQ6OndpbAogICAgIG1fY2xp ZW50LndpbGxEZXN0cm95R2xvYmFsT2JqZWN0Rm9yRE9NV2luZG93RXh0ZW5zaW9uKHRvQVBJKHBh Z2UpLCB0b0FQSShleHRlbnNpb24uZ2V0KCkpLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKIH0KIAor Ym9vbCBJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQ6OnNob3VsZEZvcmNlVW5pdmVyc2Fs QWNjZXNzRnJvbUxvY2FsVVJMKFdlYlBhZ2UqIHBhZ2UsIGNvbnN0IFN0cmluZyYgdXJsKQorewor ICAgIGlmICghbV9jbGllbnQuc2hvdWxkRm9yY2VVbml2ZXJzYWxBY2Nlc3NGcm9tTG9jYWxVUkwp CisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiBtX2NsaWVudC5zaG91bGRGb3Jj ZVVuaXZlcnNhbEFjY2Vzc0Zyb21Mb2NhbFVSTCh0b0FQSShwYWdlKSwgdG9BUEkodXJsLmltcGwo KSksIG1fY2xpZW50LmNsaWVudEluZm8pOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5k bGVQYWdlTG9hZGVyQ2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuaAkocmV2 aXNpb24gMTE3NTE0KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRs ZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNzks NiArNzksOCBAQCBwdWJsaWM6CiAgICAgdm9pZCB3aWxsRGlzY29ubmVjdERPTVdpbmRvd0V4dGVu c2lvbkZyb21HbG9iYWxPYmplY3QoV2ViUGFnZSosIFdlYkNvcmU6OkRPTVdpbmRvd0V4dGVuc2lv biopOwogICAgIHZvaWQgZGlkUmVjb25uZWN0RE9NV2luZG93RXh0ZW5zaW9uVG9HbG9iYWxPYmpl Y3QoV2ViUGFnZSosIFdlYkNvcmU6OkRPTVdpbmRvd0V4dGVuc2lvbiopOwogICAgIHZvaWQgd2ls bERlc3Ryb3lHbG9iYWxPYmplY3RGb3JET01XaW5kb3dFeHRlbnNpb24oV2ViUGFnZSosIFdlYkNv cmU6OkRPTVdpbmRvd0V4dGVuc2lvbiopOworCisgICAgYm9vbCBzaG91bGRGb3JjZVVuaXZlcnNh bEFjY2Vzc0Zyb21Mb2NhbFVSTChXZWJQYWdlKiwgY29uc3QgU3RyaW5nJiB1cmwpOwogfTsKIAog fSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmgJKHJl dmlzaW9uIDExNzUxNCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5k bGUvQVBJL2MvV0tCdW5kbGVQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwOCw2ICsxMDgsNyBA QCB0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VHbG9iYWxPYmplY3RJCiB0eXBlZGVmIHZvaWQg KCpXS0J1bmRsZVBhZ2VXaWxsRGlzY29ubmVjdERPTVdpbmRvd0V4dGVuc2lvbkZyb21HbG9iYWxP YmplY3RDYWxsYmFjaykoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxlRE9NV2luZG93RXh0 ZW5zaW9uUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLQnVu ZGxlUGFnZURpZFJlY29ubmVjdERPTVdpbmRvd0V4dGVuc2lvblRvR2xvYmFsT2JqZWN0Q2FsbGJh Y2spKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1bmRsZURPTVdpbmRvd0V4dGVuc2lvblJlZiwg Y29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VXaWxs RGVzdHJveUdsb2JhbE9iamVjdEZvckRPTVdpbmRvd0V4dGVuc2lvbkNhbGxiYWNrKShXS0J1bmRs ZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVET01XaW5kb3dFeHRlbnNpb25SZWYsIGNvbnN0IHZvaWQq IGNsaWVudEluZm8pOwordHlwZWRlZiBib29sICgqV0tCdW5kbGVQYWdlU2hvdWxkRm9yY2VVbml2 ZXJzYWxBY2Nlc3NGcm9tTG9jYWxVUkxDYWxsYmFjaykoV0tCdW5kbGVQYWdlUmVmLCBXS1N0cmlu Z1JlZiB1cmwsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwogCiBzdHJ1Y3QgV0tCdW5kbGVQYWdl TG9hZGVyQ2xpZW50IHsKICAgICBpbnQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2ZXJzaW9uOwpAQCAtMTQ1LDYgKzE0 Niw3IEBAIHN0cnVjdCBXS0J1bmRsZVBhZ2VMb2FkZXJDbGllbnQgewogICAgIAogICAgIC8vIFZl cnNpb24gMgogICAgIFdLQnVuZGxlUGFnZURpZEZpbmlzaFByb2dyZXNzQ2FsbGJhY2sgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZEZpbmlzaFByb2dyZXNzOworICAgIFdLQnVu ZGxlUGFnZVNob3VsZEZvcmNlVW5pdmVyc2FsQWNjZXNzRnJvbUxvY2FsVVJMQ2FsbGJhY2sgICAg ICAgICAgICAgIHNob3VsZEZvcmNlVW5pdmVyc2FsQWNjZXNzRnJvbUxvY2FsVVJMOwogfTsKIHR5 cGVkZWYgc3RydWN0IFdLQnVuZGxlUGFnZUxvYWRlckNsaWVudCBXS0J1bmRsZVBhZ2VMb2FkZXJD bGllbnQ7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCShyZXZpc2lv biAxMTc1MTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTUzNCw2ICsxNTM0LDE1 IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpZENoYW5nZVNjcm8KICAgICB3ZWJQYWdl LT5kaWRDaGFuZ2VTY3JvbGxPZmZzZXRGb3JNYWluRnJhbWUoKTsKIH0KIAorYm9vbCBXZWJGcmFt ZUxvYWRlckNsaWVudDo6c2hvdWxkRm9yY2VVbml2ZXJzYWxBY2Nlc3NGcm9tTG9jYWxVUkwoY29u c3QgV2ViQ29yZTo6S1VSTCYgdXJsKQoreworICAgIFdlYlBhZ2UqIHdlYlBhZ2UgPSBtX2ZyYW1l LT5wYWdlKCk7CisgICAgaWYgKCF3ZWJQYWdlKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAg ICByZXR1cm4gd2ViUGFnZS0+aW5qZWN0ZWRCdW5kbGVMb2FkZXJDbGllbnQoKS5zaG91bGRGb3Jj ZVVuaXZlcnNhbEFjY2Vzc0Zyb21Mb2NhbFVSTCh3ZWJQYWdlLCB1cmwuc3RyaW5nKCkpOworfQor CiBQYXNzUmVmUHRyPEZyYW1lTmV0d29ya2luZ0NvbnRleHQ+IFdlYkZyYW1lTG9hZGVyQ2xpZW50 OjpjcmVhdGVOZXR3b3JraW5nQ29udGV4dCgpCiB7CiAgICAgUmVmUHRyPFdlYkZyYW1lTmV0d29y a2luZ0NvbnRleHQ+IGNvbnRleHQgPSBXZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0OjpjcmVhdGUo bV9mcmFtZSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCShyZXZpc2lvbiAx MTc1MTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTIyMCw2ICsyMjAsOCBAQCBwcml2 YXRlOgogCiAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZVNjcm9sbE9mZnNldCgpIE9WRVJSSURF OwogCisgICAgdmlydHVhbCBib29sIHNob3VsZEZvcmNlVW5pdmVyc2FsQWNjZXNzRnJvbUxvY2Fs VVJMKGNvbnN0IFdlYkNvcmU6OktVUkwmKSBPVkVSUklERTsKKwogICAgIHZpcnR1YWwgUGFzc1Jl ZlB0cjxXZWJDb3JlOjpGcmFtZU5ldHdvcmtpbmdDb250ZXh0PiBjcmVhdGVOZXR3b3JraW5nQ29u dGV4dCgpIE9WRVJSSURFOwogCiAgICAgV2ViRnJhbWUqIG1fZnJhbWU7CkluZGV4OiBUb29scy9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMTgwNjIp CisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAx Mi0wNS0yMiAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KKworICAgICAgICBb V0syXSBMZXQgdGhlIGNsaWVudCBnaXZlIGxvY2FsIGZpbGVzIHVuaXZlcnNhbCBhY2Nlc3Mgb24g YSBjYXNlIGJ5IGNhc2UgYmFzaXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg3MTc0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMTAyNDMzMD4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYktpdFRl c3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcDogKFdUUjo6SW5q ZWN0ZWRCdW5kbGVQYWdlOjpJbmplY3RlZEJ1bmRsZVBhZ2UpOgorICAgICAgICBBZGRlZCBpbml0 aWFsaXphdGlvbiBvZiBhIG5ldyBzdHJ1Y3R1cmUgbWVtYmVyIHRvIHByZXZlbnQgYnVpbGQgZmFp bHVyZS4KKwogMjAxMi0wNS0yMiAgS2F1c2FseWEgTWFkaHVzdWRoYW5hbiAgPGttYWRodXN1QGNo cm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIFVzZSBvdmVybG9hZGVkIHByaW50QmVn aW4oKSB3ZWJraXQgQVBJIHRvIHN1cHBvcnQgYXV0byBmaXQgdG8gcGFnZSBmdW5jdGlvbmFsaXR5 LgpJbmRleDogVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1 bmRsZVBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0 ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcAkocmV2aXNpb24gMTE3NTE0KQorKysgVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yNDEsNiArMjQxLDcgQEAgSW5qZWN0ZWRCdW5kbGVQYWdlOjpJ bmplY3RlZEJ1bmRsZVBhZ2UoVwogICAgICAgICAwLCAvLyBkaWRSZWNvbm5lY3RET01XaW5kb3dF eHRlbnNpb25Ub0dsb2JhbE9iamVjdAogICAgICAgICAwLCAvLyB3aWxsRGVzdHJveUdsb2JhbE9i amVjdEZvckRPTVdpbmRvd0V4dGVuc2lvbgogICAgICAgICBkaWRGaW5pc2hQcm9ncmVzcywgLy8g ZGlkRmluaXNoUHJvZ3Jlc3MKKyAgICAgICAgMCAvLyBzaG91bGRGb3JjZVVuaXZlcnNhbEFjY2Vz c0Zyb21Mb2NhbFVSTAogICAgIH07CiAgICAgV0tCdW5kbGVQYWdlU2V0UGFnZUxvYWRlckNsaWVu dChtX3BhZ2UsICZsb2FkZXJDbGllbnQpOwogCg==