163938 2016-10-25 01:05:53 -0700 Make CachedResourceLoader originsMatch check more efficient 2016-10-26 01:11:06 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 youennf youennf cdumez commit-queue darin dbates japhet oldest_to_newest 1244144 0 youennf 2016-10-25 01:05:53 -0700 As a follow-up of bug 163242, we could migrate the originsMatch helper routine to SecurityOrigin so as to make it more efficient. 1244145 1 292732 youennf 2016-10-25 01:09:23 -0700 Created attachment 292732 Patch 1244241 2 292732 darin 2016-10-25 09:44:37 -0700 Comment on attachment 292732 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=292732&action=review > Source/WebCore/page/SecurityOrigin.cpp:488 > + if (!origin1 || !origin2) > + return false; So nullptr does not match nullptr? Probably worth documenting in the header. > Source/WebCore/page/SecurityOrigin.h:93 > + static bool originsMatch(const SecurityOrigin*, const SecurityOrigin*); I think this might be nicer as a free function rather than a member function, although I like it being in this header. Also would be nice to expose two overloads so we can call it with either references or pointers. 1244656 3 292881 youennf 2016-10-26 00:35:32 -0700 Created attachment 292881 Patch for landing 1244663 4 292881 commit-queue 2016-10-26 01:11:01 -0700 Comment on attachment 292881 Patch for landing Clearing flags on attachment: 292881 Committed r207871: <http://trac.webkit.org/changeset/207871> 1244664 5 commit-queue 2016-10-26 01:11:06 -0700 All reviewed patches have been landed. Closing bug. 292732 2016-10-25 01:09:23 -0700 2016-10-26 00:35:24 -0700 Patch bug-163938-20161025100537.patch text/plain 6284 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3ODA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjc3YjAzNzhlOGIxM2Uy ODlkOGVhMWZjMjA2MTk1ZTI0MmQ4YzNiZS4uYmYxZmU5NGI3ZWYzMDc4YmMwYWE1ZGNlOTEzNzhm NGZhMGNiZWQxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE2LTEwLTI1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIENhY2hlZFJlc291 cmNlTG9hZGVyIG9yaWdpbnNNYXRjaCBjaGVjayBtb3JlIGVmZmljaWVudAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzOTM4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlIG9mIGJlaGF2aW9y LgorCisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpzaG91bGRVcGRhdGVDYWNoZWRS ZXNvdXJjZVdpdGhDdXJyZW50UmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpvcmlnaW5zTWF0 Y2gpOiBNb3ZlZCB0byBTZWN1cml0eU9yaWdpbi5jcHAuCisgICAgICAgICogcGFnZS9TZWN1cml0 eU9yaWdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjphcmVPcmlnaW5zTWF0Y2hpbmcpOiBIZWxw ZXIgcm91dGluZSB0byBjaGVjayB3aGV0aGVyIG9yaWdpbnMgYXJlIG1hdGNoaW5nLgorICAgICAg ICAoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW46Om9yaWdpbnNNYXRjaCk6IEVuc3VyaW5nIHN0cmlu ZyBjb21wYXJpc29uIHByb3ZpZGVzIHRoZSBzYW1lIHJlc3VsdCBhcyB0aGlzIGZ1bmN0aW9uLgor ICAgICAgICAqIHBhZ2UvU2VjdXJpdHlPcmlnaW4uaDoKKyAgICAgICAgKFdlYkNvcmU6OlNlY3Vy aXR5T3JpZ2luOjpwcm90b2NvbCk6CisgICAgICAgIChXZWJDb3JlOjpTZWN1cml0eU9yaWdpbjo6 aG9zdCk6CisgICAgICAgIChXZWJDb3JlOjpTZWN1cml0eU9yaWdpbjo6ZG9tYWluKToKKwogMjAx Ni0xMC0yNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIElEQkRh dGFiYXNlLmNyZWF0ZU9iamVjdFN0b3JlKCkgc2hvdWxkIHRha2UgYSBJREJPYmplY3RTdG9yZVBh cmFtZXRlcnMgZGljdGlvbmFyeSBpbiBwYXJhbWV0ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IGQ4MzJkZThiMGY1 NDU0OTgxN2U1MjQ1ZjAzZTNhNjExMjg1NTJhN2QuLjFlMGI3MmZhMTc4OTA4ZmQ0YTI4NmY0MjA4 NGNiOGVlMTE3NmIwOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcApAQCAtNTUwLDE3ICs1NTAsNiBAQCBib29sIENhY2hl ZFJlc291cmNlTG9hZGVyOjpzaG91bGRDb250aW51ZUFmdGVyTm90aWZ5aW5nTG9hZGVkRnJvbU1l bW9yeUNhY2hlKGNvbgogICAgIHJldHVybiAhbmV3UmVxdWVzdC5pc051bGwoKTsKIH0KIAotc3Rh dGljIGlubGluZSBib29sIG9yaWdpbnNNYXRjaChjb25zdCBDYWNoZWRSZXNvdXJjZVJlcXVlc3Qm IHJlcXVlc3QsIGNvbnN0IENhY2hlZFJlc291cmNlJiByZXNvdXJjZSkKLXsKLSAgICBpZiAocmVx dWVzdC5vcmlnaW4oKSA9PSByZXNvdXJjZS5vcmlnaW4oKSkKLSAgICAgICAgcmV0dXJuIHRydWU7 Ci0gICAgaWYgKCFyZXF1ZXN0Lm9yaWdpbigpIHx8ICFyZXNvdXJjZS5vcmlnaW4oKSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOwotICAgIC8vIFdlIHVzZSBzdHJpbmcgY29tcGFyaXNvbiBhcyB0aGlz IGlzIGhvdyB0aGV5IGFyZSBzZXJpYWxpemVkIGFzIEhUVFAgT3JpZ2luIGhlYWRlciB2YWx1ZS4K LSAgICAvLyBUaGlzIGlzIGluIHBhcnRpY3VsYXIgdXNlZnVsIGZvciB1bmlxdWUgb3JpZ2lucyB0 aGF0IGFyZSBzZXJpYWxpemVkIGFzICJudWxsIgotICAgIHJldHVybiByZXF1ZXN0Lm9yaWdpbigp LT50b1N0cmluZygpID09IHJlc291cmNlLm9yaWdpbigpLT50b1N0cmluZygpOwotfQotCiBib29s IENhY2hlZFJlc291cmNlTG9hZGVyOjpzaG91bGRVcGRhdGVDYWNoZWRSZXNvdXJjZVdpdGhDdXJy ZW50UmVxdWVzdChjb25zdCBDYWNoZWRSZXNvdXJjZSYgcmVzb3VyY2UsIGNvbnN0IENhY2hlZFJl c291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKICAgICAvLyBXZWJLaXQgaXMgbm90IHN1cHBvcnRp bmcgQ09SUyBmb3IgZm9udHMgKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04NjgxNyksIG5vIG5lZWQgdG8gdXBkYXRlIHRoZSByZXNvdXJjZSBiZWZvcmUgcmV1c2luZyBp dC4KQEAgLTU5NCw3ICs1ODMsNyBAQCBib29sIENhY2hlZFJlc291cmNlTG9hZGVyOjpzaG91bGRV cGRhdGVDYWNoZWRSZXNvdXJjZVdpdGhDdXJyZW50UmVxdWVzdChjb25zdCBDYQogICAgICAgICBi cmVhazsKICAgICB9CiAKLSAgICBpZiAocmVzb3VyY2Uub3B0aW9ucygpLm1vZGUgIT0gcmVxdWVz dC5vcHRpb25zKCkubW9kZSB8fCAhb3JpZ2luc01hdGNoKHJlcXVlc3QsIHJlc291cmNlKSkKKyAg ICBpZiAocmVzb3VyY2Uub3B0aW9ucygpLm1vZGUgIT0gcmVxdWVzdC5vcHRpb25zKCkubW9kZSB8 fCAhU2VjdXJpdHlPcmlnaW46Om9yaWdpbnNNYXRjaChyZXF1ZXN0Lm9yaWdpbigpLCByZXNvdXJj ZS5vcmlnaW4oKSkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgaWYgKHJlc291cmNlLm9w dGlvbnMoKS5yZWRpcmVjdCAhPSByZXF1ZXN0Lm9wdGlvbnMoKS5yZWRpcmVjdCAmJiByZXNvdXJj ZS5oYXNSZWRpcmVjdGlvbnMoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2Vj dXJpdHlPcmlnaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAK aW5kZXggZTFhZTc0ZTlhNzU5ZWVmMDQ1MzAxNTc4MGY2YTI4NDg5MThjNGY2MC4uMGUzNzE1NjNi MDk0NWM0M2JjYWVhZTQ2ZjcxYTE4MWMzM2UxZGVmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1 cml0eU9yaWdpbi5jcHAKQEAgLTQ2Miw2ICs0NjIsMzYgQEAgU3RyaW5nIFNlY3VyaXR5T3JpZ2lu Ojp0b1Jhd1N0cmluZygpIGNvbnN0CiAgICAgcmV0dXJuIHJlc3VsdC50b1N0cmluZygpOwogfQog CitzdGF0aWMgaW5saW5lIGJvb2wgYXJlT3JpZ2luc01hdGNoaW5nKGNvbnN0IFNlY3VyaXR5T3Jp Z2luJiBvcmlnaW4xLCBjb25zdCBTZWN1cml0eU9yaWdpbiYgb3JpZ2luMikKK3sKKyAgICBpZiAo b3JpZ2luMS5pc1VuaXF1ZSgpIHx8IG9yaWdpbjIuaXNVbmlxdWUoKSkKKyAgICAgICAgcmV0dXJu IG9yaWdpbjEuaXNVbmlxdWUoKSA9PSBvcmlnaW4yLmlzVW5pcXVlKCk7CisKKyAgICBpZiAob3Jp Z2luMS5wcm90b2NvbCgpICE9IG9yaWdpbjIucHJvdG9jb2woKSkKKyAgICAgICAgcmV0dXJuIGZh bHNlOworCisgICAgaWYgKG9yaWdpbjEucHJvdG9jb2woKSA9PSAiZmlsZSIpCisgICAgICAgIHJl dHVybiB0cnVlOworCisgICAgaWYgKG9yaWdpbjEuaG9zdCgpICE9IG9yaWdpbjIuaG9zdCgpKQor ICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4gb3JpZ2luMS5wb3J0KCkgPT0gb3Jp Z2luMi5wb3J0KCk7Cit9CisKKy8vIFRoaXMgZnVuY3Rpb24gbWltaWNrcyB0aGUgcmVzdWx0IG9m IHN0cmluZyBjb21wYXJpc29uIG9mIHNlcmlhbGl6ZWQgb3JpZ2lucworYm9vbCBTZWN1cml0eU9y aWdpbjo6b3JpZ2luc01hdGNoKGNvbnN0IFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4xLCBjb25zdCBT ZWN1cml0eU9yaWdpbiogb3JpZ2luMikKK3sKKyAgICBpZiAob3JpZ2luMSA9PSBvcmlnaW4yKQor ICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBpZiAoIW9yaWdpbjEgfHwgIW9yaWdpbjIpCisgICAg ICAgIHJldHVybiBmYWxzZTsKKworICAgIGJvb2wgcmVzdWx0ID0gYXJlT3JpZ2luc01hdGNoaW5n KCpvcmlnaW4xLCAqb3JpZ2luMik7CisgICAgQVNTRVJUKHJlc3VsdCA9PSAob3JpZ2luMS0+dG9T dHJpbmcoKSA9PSBvcmlnaW4yLT50b1N0cmluZygpKSk7CisgICAgcmV0dXJuIHJlc3VsdDsKK30K KwogUmVmPFNlY3VyaXR5T3JpZ2luPiBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJvbVN0cmluZyhj b25zdCBTdHJpbmcmIG9yaWdpblN0cmluZykKIHsKICAgICByZXR1cm4gU2VjdXJpdHlPcmlnaW46 OmNyZWF0ZShVUkwoVVJMKCksIG9yaWdpblN0cmluZykpOwpAQCAtNDcwLDEyICs1MDAsMTIgQEAg UmVmPFNlY3VyaXR5T3JpZ2luPiBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJvbVN0cmluZyhjb25z dCBTdHJpbmcmIG9yaWdpblN0cmluZykKIHN0YXRpYyBjb25zdCBjaGFyIHNlcGFyYXRvckNoYXJh Y3RlciA9ICdfJzsKIAogUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiBTZWN1cml0eU9yaWdpbjo6bWF5 YmVDcmVhdGVGcm9tRGF0YWJhc2VJZGVudGlmaWVyKGNvbnN0IFN0cmluZyYgZGF0YWJhc2VJZGVu dGlmaWVyKQoteyAKK3sKICAgICAvLyBNYWtlIHN1cmUgdGhlcmUncyBhIGZpcnN0IHNlcGFyYXRv cgogICAgIHNpemVfdCBzZXBhcmF0b3IxID0gZGF0YWJhc2VJZGVudGlmaWVyLmZpbmQoc2VwYXJh dG9yQ2hhcmFjdGVyKTsKICAgICBpZiAoc2VwYXJhdG9yMSA9PSBub3RGb3VuZCkKICAgICAgICAg cmV0dXJuIG51bGxwdHI7Ci0gICAgICAgIAorCiAgICAgLy8gTWFrZSBzdXJlIHRoZXJlJ3MgYSBz ZWNvbmQgc2VwYXJhdG9yCiAgICAgc2l6ZV90IHNlcGFyYXRvcjIgPSBkYXRhYmFzZUlkZW50aWZp ZXIucmV2ZXJzZUZpbmQoc2VwYXJhdG9yQ2hhcmFjdGVyKTsKICAgICBpZiAoc2VwYXJhdG9yMiA9 PSBub3RGb3VuZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmln aW4uaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uaAppbmRleCAwMTFkMjBl NDQ3ZTc3YTM4ZWJhOWFlZThhZDFjMDA5ZTdmYTgyZThlLi5jNTQzMmU4OGU4YzZiZGYxOGQ4ZTE4 MWU4MDZlOTNiMGZlZjg4NjcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3Vy aXR5T3JpZ2luLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oCkBA IC04NCwxMSArODQsMTQgQEAgcHVibGljOgogICAgIHZvaWQgc2V0RG9tYWluRnJvbURPTShjb25z dCBTdHJpbmcmIG5ld0RvbWFpbik7CiAgICAgYm9vbCBkb21haW5XYXNTZXRJbkRPTSgpIGNvbnN0 IHsgcmV0dXJuIG1fZG9tYWluV2FzU2V0SW5ET007IH0KIAotICAgIFN0cmluZyBwcm90b2NvbCgp IGNvbnN0IHsgcmV0dXJuIG1fcHJvdG9jb2w7IH0KLSAgICBTdHJpbmcgaG9zdCgpIGNvbnN0IHsg cmV0dXJuIG1faG9zdDsgfQotICAgIFN0cmluZyBkb21haW4oKSBjb25zdCB7IHJldHVybiBtX2Rv bWFpbjsgfQorICAgIGNvbnN0IFN0cmluZyYgcHJvdG9jb2woKSBjb25zdCB7IHJldHVybiBtX3By b3RvY29sOyB9CisgICAgY29uc3QgU3RyaW5nJiBob3N0KCkgY29uc3QgeyByZXR1cm4gbV9ob3N0 OyB9CisgICAgY29uc3QgU3RyaW5nJiBkb21haW4oKSBjb25zdCB7IHJldHVybiBtX2RvbWFpbjsg fQogICAgIE9wdGlvbmFsPHVpbnQxNl90PiBwb3J0KCkgY29uc3QgeyByZXR1cm4gbV9wb3J0OyB9 CiAKKyAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhlIE9yaWdpbiBoZWFkZXIgdmFsdWVzIHNlcmlh bGl6ZWQgZnJvbSB0aGVzZSB0d28gb3JpZ2lucyB3b3VsZCBiZSB0aGUgc2FtZS4KKyAgICBzdGF0 aWMgYm9vbCBvcmlnaW5zTWF0Y2goY29uc3QgU2VjdXJpdHlPcmlnaW4qLCBjb25zdCBTZWN1cml0 eU9yaWdpbiopOworCiAgICAgLy8gUmV0dXJucyB0cnVlIGlmIGEgZ2l2ZW4gVVJMIGlzIHNlY3Vy ZSwgYmFzZWQgZWl0aGVyIGRpcmVjdGx5IG9uIGl0cwogICAgIC8vIG93biBwcm90b2NvbCwgb3Is IHdoZW4gcmVsZXZhbnQsIG9uIHRoZSBwcm90b2NvbCBvZiBpdHMgImlubmVyIFVSTCIKICAgICAv LyBQcm90b2NvbHMgbGlrZSBibG9iOiBhbmQgZmlsZXN5c3RlbTogZmFsbCBpbnRvIHRoaXMgbGF0 dGVyIGNhdGVnb3J5Lgo= 292881 2016-10-26 00:35:32 -0700 2016-10-26 01:11:01 -0700 Patch for landing bug-163938-20161026093143.patch text/plain 6360 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3ODY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGE5MGQwYTdiYWFlNjk2 MzdlMDJhOTE5OWNiOTk2NTZhNzgzYzIzMC4uYTZmZDNjMzc0YjBiNTZhZGIyZGIwYWYzNTRhNDNl YTc0Mjg5NjUxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE2LTEwLTI2ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIENhY2hlZFJlc291 cmNlTG9hZGVyIG9yaWdpbnNNYXRjaCBjaGVjayBtb3JlIGVmZmljaWVudAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzOTM4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgTm8gY2hhbmdlIG9mIGJlaGF2aW9yLgor CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpzaG91bGRVcGRhdGVDYWNoZWRSZXNv dXJjZVdpdGhDdXJyZW50UmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpvcmlnaW5zTWF0Y2gp OiBNb3ZlZCB0byBTZWN1cml0eU9yaWdpbi5jcHAuCisgICAgICAgICogcGFnZS9TZWN1cml0eU9y aWdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjphcmVPcmlnaW5zTWF0Y2hpbmcpOiBIZWxwZXIg cm91dGluZSB0byBjaGVjayB3aGV0aGVyIG9yaWdpbnMgYXJlIG1hdGNoaW5nLgorICAgICAgICAo V2ViQ29yZTo6b3JpZ2luc01hdGNoKTogRW5zdXJpbmcgc3RyaW5nIGNvbXBhcmlzb24gcHJvdmlk ZXMgdGhlIHNhbWUgcmVzdWx0IGFzIHRoaXMgZnVuY3Rpb24uCisgICAgICAgICogcGFnZS9TZWN1 cml0eU9yaWdpbi5oOgorICAgICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW46OnByb3RvY29s KToKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjpob3N0KToKKyAgICAgICAgKFdl YkNvcmU6OlNlY3VyaXR5T3JpZ2luOjpkb21haW4pOgorCiAyMDE2LTEwLTI1ICBZdXN1a2UgU3V6 dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgogCiAgICAgICAgIFtET01KSVRdIFRlbGwgSURM IHJlc3VsdCB0eXBlIHRvIERGRyB0byBkcm9wIHR5cGUgY2hlY2tzIGluIEFJCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAppbmRl eCA0MGIzMGI0NWM1OTBiNWE5MDk4MjgyNzIzYzY5M2E3YWJkNGRhMmIyLi4wNjM4YmM4ODI3NDFk NWYwZjQ5OWUxZDZkYTcxMDJhZDE5ZjIzOTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKQEAgLTU1MSwxNyArNTUxLDYg QEAgYm9vbCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6c2hvdWxkQ29udGludWVBZnRlck5vdGlmeWlu Z0xvYWRlZEZyb21NZW1vcnlDYWNoZShjb24KICAgICByZXR1cm4gIW5ld1JlcXVlc3QuaXNOdWxs KCk7CiB9CiAKLXN0YXRpYyBpbmxpbmUgYm9vbCBvcmlnaW5zTWF0Y2goY29uc3QgQ2FjaGVkUmVz b3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBDYWNoZWRSZXNvdXJjZSYgcmVzb3VyY2UpCi17 Ci0gICAgaWYgKHJlcXVlc3Qub3JpZ2luKCkgPT0gcmVzb3VyY2Uub3JpZ2luKCkpCi0gICAgICAg IHJldHVybiB0cnVlOwotICAgIGlmICghcmVxdWVzdC5vcmlnaW4oKSB8fCAhcmVzb3VyY2Uub3Jp Z2luKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAvLyBXZSB1c2Ugc3RyaW5nIGNvbXBh cmlzb24gYXMgdGhpcyBpcyBob3cgdGhleSBhcmUgc2VyaWFsaXplZCBhcyBIVFRQIE9yaWdpbiBo ZWFkZXIgdmFsdWUuCi0gICAgLy8gVGhpcyBpcyBpbiBwYXJ0aWN1bGFyIHVzZWZ1bCBmb3IgdW5p cXVlIG9yaWdpbnMgdGhhdCBhcmUgc2VyaWFsaXplZCBhcyAibnVsbCIKLSAgICByZXR1cm4gcmVx dWVzdC5vcmlnaW4oKS0+dG9TdHJpbmcoKSA9PSByZXNvdXJjZS5vcmlnaW4oKS0+dG9TdHJpbmco KTsKLX0KLQogYm9vbCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6c2hvdWxkVXBkYXRlQ2FjaGVkUmVz b3VyY2VXaXRoQ3VycmVudFJlcXVlc3QoY29uc3QgQ2FjaGVkUmVzb3VyY2UmIHJlc291cmNlLCBj b25zdCBDYWNoZWRSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7CiAgICAgLy8gV2ViS2l0IGlz IG5vdCBzdXBwb3J0aW5nIENPUlMgZm9yIGZvbnRzIChodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODY4MTcpLCBubyBuZWVkIHRvIHVwZGF0ZSB0aGUgcmVzb3VyY2UgYmVm b3JlIHJldXNpbmcgaXQuCkBAIC01OTUsNyArNTg0LDcgQEAgYm9vbCBDYWNoZWRSZXNvdXJjZUxv YWRlcjo6c2hvdWxkVXBkYXRlQ2FjaGVkUmVzb3VyY2VXaXRoQ3VycmVudFJlcXVlc3QoY29uc3Qg Q2EKICAgICAgICAgYnJlYWs7CiAgICAgfQogCi0gICAgaWYgKHJlc291cmNlLm9wdGlvbnMoKS5t b2RlICE9IHJlcXVlc3Qub3B0aW9ucygpLm1vZGUgfHwgIW9yaWdpbnNNYXRjaChyZXF1ZXN0LCBy ZXNvdXJjZSkpCisgICAgaWYgKHJlc291cmNlLm9wdGlvbnMoKS5tb2RlICE9IHJlcXVlc3Qub3B0 aW9ucygpLm1vZGUgfHwgIW9yaWdpbnNNYXRjaChyZXF1ZXN0Lm9yaWdpbigpLCByZXNvdXJjZS5v cmlnaW4oKSkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgaWYgKHJlc291cmNlLm9wdGlv bnMoKS5yZWRpcmVjdCAhPSByZXF1ZXN0Lm9wdGlvbnMoKS5yZWRpcmVjdCAmJiByZXNvdXJjZS5o YXNSZWRpcmVjdGlvbnMoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJp dHlPcmlnaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKaW5k ZXggZTFhZTc0ZTlhNzU5ZWVmMDQ1MzAxNTc4MGY2YTI4NDg5MThjNGY2MC4uZTM1YTIzN2U0ZDgz M2M1MmM1MDBlZjY1ZDhmNTBjZjI1MDRmZDI0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0 eU9yaWdpbi5jcHAKQEAgLTQ2Miw2ICs0NjIsNDIgQEAgU3RyaW5nIFNlY3VyaXR5T3JpZ2luOjp0 b1Jhd1N0cmluZygpIGNvbnN0CiAgICAgcmV0dXJuIHJlc3VsdC50b1N0cmluZygpOwogfQogCitz dGF0aWMgaW5saW5lIGJvb2wgYXJlT3JpZ2luc01hdGNoaW5nKGNvbnN0IFNlY3VyaXR5T3JpZ2lu JiBvcmlnaW4xLCBjb25zdCBTZWN1cml0eU9yaWdpbiYgb3JpZ2luMikKK3sKKyAgICBpZiAob3Jp Z2luMS5pc1VuaXF1ZSgpIHx8IG9yaWdpbjIuaXNVbmlxdWUoKSkKKyAgICAgICAgcmV0dXJuIG9y aWdpbjEuaXNVbmlxdWUoKSA9PSBvcmlnaW4yLmlzVW5pcXVlKCk7CisKKyAgICBpZiAob3JpZ2lu MS5wcm90b2NvbCgpICE9IG9yaWdpbjIucHJvdG9jb2woKSkKKyAgICAgICAgcmV0dXJuIGZhbHNl OworCisgICAgaWYgKG9yaWdpbjEucHJvdG9jb2woKSA9PSAiZmlsZSIpCisgICAgICAgIHJldHVy biB0cnVlOworCisgICAgaWYgKG9yaWdpbjEuaG9zdCgpICE9IG9yaWdpbjIuaG9zdCgpKQorICAg ICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4gb3JpZ2luMS5wb3J0KCkgPT0gb3JpZ2lu Mi5wb3J0KCk7Cit9CisKKy8vIFRoaXMgZnVuY3Rpb24gbWltaWNzIHRoZSByZXN1bHQgb2Ygc3Ry aW5nIGNvbXBhcmlzb24gb2Ygc2VyaWFsaXplZCBvcmlnaW5zCitib29sIG9yaWdpbnNNYXRjaChj b25zdCBTZWN1cml0eU9yaWdpbiYgb3JpZ2luMSwgY29uc3QgU2VjdXJpdHlPcmlnaW4mIG9yaWdp bjIpCit7CisgICAgaWYgKCZvcmlnaW4xID09ICZvcmlnaW4yKQorICAgICAgICByZXR1cm4gdHJ1 ZTsKKworICAgIGJvb2wgcmVzdWx0ID0gYXJlT3JpZ2luc01hdGNoaW5nKG9yaWdpbjEsIG9yaWdp bjIpOworICAgIEFTU0VSVChyZXN1bHQgPT0gKG9yaWdpbjEudG9TdHJpbmcoKSA9PSBvcmlnaW4y LnRvU3RyaW5nKCkpKTsKKyAgICByZXR1cm4gcmVzdWx0OworfQorCitib29sIG9yaWdpbnNNYXRj aChjb25zdCBTZWN1cml0eU9yaWdpbiogb3JpZ2luMSwgY29uc3QgU2VjdXJpdHlPcmlnaW4qIG9y aWdpbjIpCit7CisgICAgaWYgKCFvcmlnaW4xIHx8ICFvcmlnaW4yKQorICAgICAgICByZXR1cm4g b3JpZ2luMSA9PSBvcmlnaW4yOworCisgICAgcmV0dXJuIG9yaWdpbnNNYXRjaCgqb3JpZ2luMSwg Km9yaWdpbjIpOworfQorCiBSZWY8U2VjdXJpdHlPcmlnaW4+IFNlY3VyaXR5T3JpZ2luOjpjcmVh dGVGcm9tU3RyaW5nKGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nKQogewogICAgIHJldHVybiBT ZWN1cml0eU9yaWdpbjo6Y3JlYXRlKFVSTChVUkwoKSwgb3JpZ2luU3RyaW5nKSk7CkBAIC00NzAs MTIgKzUwNiwxMiBAQCBSZWY8U2VjdXJpdHlPcmlnaW4+IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGVG cm9tU3RyaW5nKGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nKQogc3RhdGljIGNvbnN0IGNoYXIg c2VwYXJhdG9yQ2hhcmFjdGVyID0gJ18nOwogCiBSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IFNlY3Vy aXR5T3JpZ2luOjptYXliZUNyZWF0ZUZyb21EYXRhYmFzZUlkZW50aWZpZXIoY29uc3QgU3RyaW5n JiBkYXRhYmFzZUlkZW50aWZpZXIpCi17IAorewogICAgIC8vIE1ha2Ugc3VyZSB0aGVyZSdzIGEg Zmlyc3Qgc2VwYXJhdG9yCiAgICAgc2l6ZV90IHNlcGFyYXRvcjEgPSBkYXRhYmFzZUlkZW50aWZp ZXIuZmluZChzZXBhcmF0b3JDaGFyYWN0ZXIpOwogICAgIGlmIChzZXBhcmF0b3IxID09IG5vdEZv dW5kKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICAgICAgCisKICAgICAvLyBNYWtlIHN1 cmUgdGhlcmUncyBhIHNlY29uZCBzZXBhcmF0b3IKICAgICBzaXplX3Qgc2VwYXJhdG9yMiA9IGRh dGFiYXNlSWRlbnRpZmllci5yZXZlcnNlRmluZChzZXBhcmF0b3JDaGFyYWN0ZXIpOwogICAgIGlm IChzZXBhcmF0b3IyID09IG5vdEZvdW5kKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9TZWN1cml0eU9yaWdpbi5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5o CmluZGV4IDAxMWQyMGU0NDdlNzdhMzhlYmE5YWVlOGFkMWMwMDllN2ZhODJlOGUuLjc4NzVhMWVi ZDBmNDY3MDkzNjliYjAxNWFjMWJjM2Q0ZjYxMWY4OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3Vy aXR5T3JpZ2luLmgKQEAgLTg0LDkgKzg0LDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0RG9tYWlu RnJvbURPTShjb25zdCBTdHJpbmcmIG5ld0RvbWFpbik7CiAgICAgYm9vbCBkb21haW5XYXNTZXRJ bkRPTSgpIGNvbnN0IHsgcmV0dXJuIG1fZG9tYWluV2FzU2V0SW5ET007IH0KIAotICAgIFN0cmlu ZyBwcm90b2NvbCgpIGNvbnN0IHsgcmV0dXJuIG1fcHJvdG9jb2w7IH0KLSAgICBTdHJpbmcgaG9z dCgpIGNvbnN0IHsgcmV0dXJuIG1faG9zdDsgfQotICAgIFN0cmluZyBkb21haW4oKSBjb25zdCB7 IHJldHVybiBtX2RvbWFpbjsgfQorICAgIGNvbnN0IFN0cmluZyYgcHJvdG9jb2woKSBjb25zdCB7 IHJldHVybiBtX3Byb3RvY29sOyB9CisgICAgY29uc3QgU3RyaW5nJiBob3N0KCkgY29uc3QgeyBy ZXR1cm4gbV9ob3N0OyB9CisgICAgY29uc3QgU3RyaW5nJiBkb21haW4oKSBjb25zdCB7IHJldHVy biBtX2RvbWFpbjsgfQogICAgIE9wdGlvbmFsPHVpbnQxNl90PiBwb3J0KCkgY29uc3QgeyByZXR1 cm4gbV9wb3J0OyB9CiAKICAgICAvLyBSZXR1cm5zIHRydWUgaWYgYSBnaXZlbiBVUkwgaXMgc2Vj dXJlLCBiYXNlZCBlaXRoZXIgZGlyZWN0bHkgb24gaXRzCkBAIC0yMzUsNCArMjM1LDggQEAgcHJp dmF0ZToKICAgICBib29sIG1fbmVlZHNEYXRhYmFzZUlkZW50aWZpZXJRdWlya0ZvckZpbGVzOwog fTsKIAorLy8gUmV0dXJucyB0cnVlIGlmIHRoZSBPcmlnaW4gaGVhZGVyIHZhbHVlcyBzZXJpYWxp emVkIGZyb20gdGhlc2UgdHdvIG9yaWdpbnMgd291bGQgYmUgdGhlIHNhbWUuCitib29sIG9yaWdp bnNNYXRjaChjb25zdCBTZWN1cml0eU9yaWdpbiYsIGNvbnN0IFNlY3VyaXR5T3JpZ2luJik7Citi b29sIG9yaWdpbnNNYXRjaChjb25zdCBTZWN1cml0eU9yaWdpbiosIGNvbnN0IFNlY3VyaXR5T3Jp Z2luKik7CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK