82685 2012-03-29 19:45:14 -0700 Add setting to disable Java for local files even if it is otherwise enabled 2012-04-02 09:24:53 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam japhet webkit.review.bot oldest_to_newest 591831 0 sam 2012-03-29 19:45:14 -0700 Add setting to disable Java for local files even if it is otherwise enabled 591832 1 134715 sam 2012-03-29 19:47:05 -0700 Created attachment 134715 Patch 593524 2 sam 2012-04-02 09:24:53 -0700 Committed r112894: <http://trac.webkit.org/changeset/112894> 134715 2012-03-29 19:47:05 -0700 2012-03-29 19:48:38 -0700 Patch bug-82685-20120329194737.patch text/plain 14001 sam U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNjM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDgwYWEzNjQ2YmRkZmY0 OTk1M2NmY2VmNjI0M2RkMTdiOTc5YzhjYy4uZmExZWJmM2JhYzIwMTc3MGY1YzBiYTVjZjVkOTNl NGMyMWVmMTI5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTAzLTI5ICBTYW0g V2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIHNldHRpbmcgdG8gZGlzYWJs ZSBKYXZhIGZvciBsb2NhbCBmaWxlcyBldmVuIGlmIGl0IGlzIG90aGVyd2lzZSBlbmFibGVkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjY4NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZS5l eHAuaW46CisgICAgICAgIEV4cG9ydCBzZXR0aW5nIHNldHRlci4KKworICAgICAgICAqIGh0bWwv SFRNTEFwcGxldEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEFwcGxldEVsZW1l bnQ6OmNhbkVtYmVkSmF2YSk6CisgICAgICAgICogbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlN1YmZyYW1lTG9hZGVyOjpyZXF1ZXN0UGx1Z2luKToKKyAgICAg ICAgKiBwYWdlL05hdmlnYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOYXZpZ2F0b3I6Omph dmFFbmFibGVkKToKKyAgICAgICAgQ2hlY2sgZm9yIGJvdGggaXNKYXZhRW5hYmxlZCBhbmQgaXNK YXZhRW5hYmxlZEZvckxvY2FsRmlsZXMuCisKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpzZXRKYXZhRW5hYmxlZEZvckxvY2FsRmlsZXMp OgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdz Ojppc0phdmFFbmFibGVkRm9yTG9jYWxGaWxlcyk6CisgICAgICAgIEFkZCBuZXcgc2V0dGluZy4K KwogMjAxMi0wMy0yOSAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAg IFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMTI1NzIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTEzMmMzZTBh ZThhM2ViYzEwNjI5YThkMGMxMmQ5NGQ3MDk1Y2Q5ZC4uOTljZGNhOTZmNTE0OGZiYjBiOTgxMWU1 MTVjMjZhYjBmMTE0YmZiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTAzLTI5 ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIHNldHRpbmcgdG8g ZGlzYWJsZSBKYXZhIGZvciBsb2NhbCBmaWxlcyBldmVuIGlmIGl0IGlzIG90aGVyd2lzZSBlbmFi bGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjY4 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hh cmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQ cmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXS1ByZWZlcmVuY2VzU2V0SmF2YUVuYWJsZWRGb3JM b2NhbEZpbGVzKToKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNHZXRKYXZhRW5hYmxlZEZvckxvY2Fs RmlsZXMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5o OgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMpOgorICAgICAgICBBZGQgcHJlZiBhcyBT UEkgYW5kIGZvcndhcmQgdG8gV2ViQ29yZS4KKwogMjAxMi0wMy0yOSAgTm8nYW0gUm9zZW50aGFs ICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgogCiAgICAgICAgIFtRdF1bV0syXSBEaXJlY3Qg Y29tcG9zaXRlZCBpbWFnZSBhc3NpZ25tZW50IGRvZXNuJ3Qgd29yawpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5p bgppbmRleCAwYzQyNmY3ZTBjMTdmNjMyOTI3OGZmMWJkZGRkNWFmMzc4NDVjNzI5Li4zNGJhZGNl MzhiZWFkYWMyZmNmZTAzMTE2YWJiMDY2MmE5NDRjMWY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpA QCAtOTg0LDcgKzk4NCw2IEBAIF9fWk43V2ViQ29yZThTZXR0aW5nczE5bWluRE9NVGltZXJJbnRl cnZhbEV2CiBfX1pON1dlYkNvcmU4U2V0dGluZ3MxOXNldFNob3dEZWJ1Z0JvcmRlcnNFYgogX19a TjdXZWJDb3JlOFNldHRpbmdzMjBzZXRDdXJzaXZlRm9udEZhbWlseUVSS04zV1RGMTJBdG9taWNT dHJpbmdFMTFVU2NyaXB0Q29kZQogX19aTjdXZWJDb3JlOFNldHRpbmdzMjBzZXRGYW50YXN5Rm9u dEZhbWlseUVSS04zV1RGMTJBdG9taWNTdHJpbmdFMTFVU2NyaXB0Q29kZQotX19aTjdXZWJDb3Jl OFNldHRpbmdzMzdzZXRGaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lRWIKIF9fWk43 V2ViQ29yZThTZXR0aW5nczIwc2V0WFNTQXVkaXRvckVuYWJsZWRFYgogX19aTjdXZWJDb3JlOFNl dHRpbmdzMjFtb2NrU2Nyb2xsYmFyc0VuYWJsZWRFdgogX19aTjdXZWJDb3JlOFNldHRpbmdzMjFz ZXRTaG93UmVwYWludENvdW50ZXJFYgpAQCAtMTAxNiw2ICsxMDE1LDcgQEAgX19aTjdXZWJDb3Jl OFNldHRpbmdzMjZkZWZhdWx0TWluRE9NVGltZXJJbnRlcnZhbEV2CiBfX1pON1dlYkNvcmU4U2V0 dGluZ3MyNnNldERlZmF1bHRUZXh0RW5jb2RpbmdOYW1lRVJLTjNXVEY2U3RyaW5nRQogX19aTjdX ZWJDb3JlOFNldHRpbmdzMjZzZXROZWVkc1NpdGVTcGVjaWZpY1F1aXJrc0ViCiBfX1pON1dlYkNv cmU4U2V0dGluZ3MyN3NldEZUUERpcmVjdG9yeVRlbXBsYXRlUGF0aEVSS04zV1RGNlN0cmluZ0UK K19fWk43V2ViQ29yZThTZXR0aW5nczI3c2V0SmF2YUVuYWJsZWRGb3JMb2NhbEZpbGVzRWIKIF9f Wk43V2ViQ29yZThTZXR0aW5nczI3c2V0TG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5RWIKIF9fWk43 V2ViQ29yZThTZXR0aW5nczI3c2V0TG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoRVJLTjNXVEY2U3Ry aW5nRQogX19aTjdXZWJDb3JlOFNldHRpbmdzMjdzZXRTcGF0aWFsTmF2aWdhdGlvbkVuYWJsZWRF YgpAQCAtMTAzOCw2ICsxMDM4LDcgQEAgX19aTjdXZWJDb3JlOFNldHRpbmdzMzVzZXRFbmZvcmNl Q1NTTUlNRVR5cGVJbk5vUXVpcmtzTW9kZUViCiBfX1pON1dlYkNvcmU4U2V0dGluZ3MzNXNldEV4 cGVyaW1lbnRhbE5vdGlmaWNhdGlvbnNFbmFibGVkRWIKIF9fWk43V2ViQ29yZThTZXR0aW5nczM1 c2V0VHJlYXRzQW55VGV4dENTU0xpbmtBc1N0eWxlc2hlZXRFYgogX19aTjdXZWJDb3JlOFNldHRp bmdzMzZzZXRPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWRFYgorX19aTjdXZWJDb3Jl OFNldHRpbmdzMzdzZXRGaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lRWIKIF9fWk43 V2ViQ29yZThTZXR0aW5nczQwc2V0SmF2YVNjcmlwdENhbk9wZW5XaW5kb3dzQXV0b21hdGljYWxs eUViCiBfX1pON1dlYkNvcmU4U2V0dGluZ3M0MHNldFRleHREaXJlY3Rpb25TdWJtZW51SW5jbHVz aW9uQmVoYXZpb3JFTlNfMzdUZXh0RGlyZWN0aW9uU3VibWVudUluY2x1c2lvbkJlaGF2aW9yRQog X19aTjdXZWJDb3JlOFNldHRpbmdzNDFzZXROZWVkc0tleWJvYXJkRXZlbnREaXNhbWJpZ3VhdGlv blF1aXJrc0ViCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBcHBsZXRFbGVt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFwcGxldEVsZW1lbnQuY3BwCmluZGV4 IGFmNjNkMjY3NzM3NzhmNTUyNGYwZDNlNDI3YTkxOGVjNjY2MDVmNzcuLjIyNzRkOGRkYTQ0ZjEz MzJjMmZiODA5ZjcxNjZiNGI0NzM2OWM5NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTEFwcGxldEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFw cGxldEVsZW1lbnQuY3BwCkBAIC0xMjgsNyArMTI4LDE2IEBAIGJvb2wgSFRNTEFwcGxldEVsZW1l bnQ6OmNhbkVtYmVkSmF2YSgpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIFNl dHRpbmdzKiBzZXR0aW5ncyA9IGRvY3VtZW50KCktPnNldHRpbmdzKCk7Ci0gICAgcmV0dXJuIHNl dHRpbmdzICYmIHNldHRpbmdzLT5pc0phdmFFbmFibGVkKCk7CisgICAgaWYgKCFzZXR0aW5ncykK KyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgaWYgKCFzZXR0aW5ncy0+aXNKYXZhRW5hYmxl ZCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoZG9jdW1lbnQoKS0+c2VjdXJp dHlPcmlnaW4oKS0+aXNMb2NhbCgpICYmICFzZXR0aW5ncy0+aXNKYXZhRW5hYmxlZEZvckxvY2Fs RmlsZXMoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIHRydWU7CiB9CiAK IHZvaWQgSFRNTEFwcGxldEVsZW1lbnQ6OmZpbmlzaFBhcnNpbmdDaGlsZHJlbigpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcAppbmRleCAzZDdmNWM1ZThiZmY3YWUwZDhi MGJhYThmODEzMGNlZDU4MmUxZTNjLi4zNDM0ZDRkZjU2ZWIxYmJlNGUxNTAzMzI5OThmZTgyNzBj ZjNiNTlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAKQEAgLTEw NCwxNCArMTA0LDIyIEBAIGJvb2wgU3ViZnJhbWVMb2FkZXI6OnJlc291cmNlV2lsbFVzZVBsdWdp bihjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBtaW1lCiBib29sIFN1YmZyYW1lTG9h ZGVyOjpyZXF1ZXN0UGx1Z2luKEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQqIG93bmVyRWxlbWVudCwg Y29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBWZWN0b3I8U3Ry aW5nPiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtVmFsdWVzLCBib29s IHVzZUZhbGxiYWNrKQogewogICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IG1fZnJhbWUtPnNldHRp bmdzKCk7Ci0gICAgaWYgKCghYWxsb3dQbHVnaW5zKEFib3V0VG9JbnN0YW50aWF0ZVBsdWdpbikK LSAgICAgICAgIC8vIEFwcGxpY2F0aW9uIHBsdWctaW5zIGFyZSBwbHVnLWlucyBpbXBsZW1lbnRl ZCBieSB0aGUgdXNlciBhZ2VudCwgZm9yIGV4YW1wbGUgUXQgcGx1Zy1pbnMsCi0gICAgICAgICAv LyBhcyBvcHBvc2VkIHRvIHRoaXJkLXBhcnR5IGNvZGUgc3VjaCBhcyBGbGFzaC4gVGhlIHVzZXIg YWdlbnQgZGVjaWRlcyB3aGV0aGVyIG9yIG5vdCB0aGV5IGFyZQotICAgICAgICAgLy8gcGVybWl0 dGVkLCByYXRoZXIgdGhhbiBXZWJLaXQuCi0gICAgICAgICAmJiAhTUlNRVR5cGVSZWdpc3RyeTo6 aXNBcHBsaWNhdGlvblBsdWdpbk1JTUVUeXBlKG1pbWVUeXBlKSkKLSAgICAgICAgfHwgKCghc2V0 dGluZ3MgfHwgIXNldHRpbmdzLT5pc0phdmFFbmFibGVkKCkpICYmIE1JTUVUeXBlUmVnaXN0cnk6 OmlzSmF2YUFwcGxldE1JTUVUeXBlKG1pbWVUeXBlKSkpCisgICAgaWYgKCFzZXR0aW5ncykKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgLy8gQXBwbGljYXRpb24gcGx1Zy1pbnMgYXJlIHBs dWctaW5zIGltcGxlbWVudGVkIGJ5IHRoZSB1c2VyIGFnZW50LCBmb3IgZXhhbXBsZSBRdCBwbHVn LWlucywKKyAgICAvLyBhcyBvcHBvc2VkIHRvIHRoaXJkLXBhcnR5IGNvZGUgc3VjaCBhcyBGbGFz aC4gVGhlIHVzZXIgYWdlbnQgZGVjaWRlcyB3aGV0aGVyIG9yIG5vdCB0aGV5IGFyZQorICAgIC8v IHBlcm1pdHRlZCwgcmF0aGVyIHRoYW4gV2ViS2l0LgorICAgIGlmICgoIWFsbG93UGx1Z2lucyhB Ym91dFRvSW5zdGFudGlhdGVQbHVnaW4pICYmICFNSU1FVHlwZVJlZ2lzdHJ5Ojppc0FwcGxpY2F0 aW9uUGx1Z2luTUlNRVR5cGUobWltZVR5cGUpKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisg ICAgaWYgKE1JTUVUeXBlUmVnaXN0cnk6OmlzSmF2YUFwcGxldE1JTUVUeXBlKG1pbWVUeXBlKSkg eworICAgICAgICBpZiAoIXNldHRpbmdzLT5pc0phdmFFbmFibGVkKCkpCisgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgICAgIGlmIChtX2ZyYW1lLT5kb2N1bWVudCgpICYmIG1fZnJhbWUt PmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPmlzTG9jYWwoKSAmJiAhc2V0dGluZ3MtPmlz SmF2YUVuYWJsZWRGb3JMb2NhbEZpbGVzKCkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgfQorCiAgICAgaWYgKG1fZnJhbWUtPmRvY3VtZW50KCkpIHsKICAgICAgICAgaWYgKG1fZnJh bWUtPmRvY3VtZW50KCktPmlzU2FuZGJveGVkKFNhbmRib3hQbHVnaW5zKSkKICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTmF2aWdhdG9y LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTmF2aWdhdG9yLmNwcAppbmRleCA0OWUzNjJiMWU0 Yzg4MGRmNmM0NGM5Nzk0ZGU3MThmNDViYWY1ZDE0Li4zYWY2ZjA3ZTlmYjEwZmM3ZTRjZTExMzlk YzQzYzc2ZTFjNTNmODA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL05hdmlnYXRv ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9OYXZpZ2F0b3IuY3BwCkBAIC0zMSwxMCAr MzEsMTEgQEAKICNpbmNsdWRlICJGcmFtZUxvYWRlci5oIgogI2luY2x1ZGUgIkZyYW1lTG9hZGVy Q2xpZW50LmgiCiAjaW5jbHVkZSAiR2VvbG9jYXRpb24uaCIKLSNpbmNsdWRlICJQYWdlLmgiCi0j aW5jbHVkZSAiUG9pbnRlckxvY2suaCIKICNpbmNsdWRlICJMYW5ndWFnZS5oIgorI2luY2x1ZGUg IlBhZ2UuaCIKICNpbmNsdWRlICJQbHVnaW5EYXRhLmgiCisjaW5jbHVkZSAiUG9pbnRlckxvY2su aCIKKyNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAj aW5jbHVkZSAiU3RvcmFnZU5hbWVzcGFjZS5oIgogI2luY2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CkBA IC0xMjYsNyArMTI3LDEyIEBAIGJvb2wgTmF2aWdhdG9yOjpqYXZhRW5hYmxlZCgpIGNvbnN0CiAg ICAgaWYgKCFtX2ZyYW1lIHx8ICFtX2ZyYW1lLT5zZXR0aW5ncygpKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKLSAgICByZXR1cm4gbV9mcmFtZS0+c2V0dGluZ3MoKS0+aXNKYXZhRW5hYmxlZCgp OworICAgIGlmICghbV9mcmFtZS0+c2V0dGluZ3MoKS0+aXNKYXZhRW5hYmxlZCgpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgaWYgKG1fZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3Jp Z2luKCktPmlzTG9jYWwoKSAmJiAhbV9mcmFtZS0+c2V0dGluZ3MoKS0+aXNKYXZhRW5hYmxlZEZv ckxvY2FsRmlsZXMoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIHRydWU7 CiB9CiAKICNpZiBFTkFCTEUoUE9JTlRFUl9MT0NLKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9TZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcApp bmRleCA2MzcyMzE4NDkzMjc2NWQ3Njg5MjUxZWVhOGQ3NjA1NzZlMzI4NzVjLi4zNWIwZjU4YTI5 OTZlNTZiNzhkMzgyNGQ4NDgwZjdjMzE2MTg2YWMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1NldHRpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNw cApAQCAtMTM0LDYgKzEzNCw3IEBAIFNldHRpbmdzOjpTZXR0aW5ncyhQYWdlKiBwYWdlKQogICAg ICwgbV9tYXhpbXVtSFRNTFBhcnNlckRPTVRyZWVEZXB0aChkZWZhdWx0TWF4aW11bUhUTUxQYXJz ZXJET01UcmVlRGVwdGgpCiAgICAgLCBtX2lzU3BhdGlhbE5hdmlnYXRpb25FbmFibGVkKGZhbHNl KQogICAgICwgbV9pc0phdmFFbmFibGVkKGZhbHNlKQorICAgICwgbV9pc0phdmFFbmFibGVkRm9y TG9jYWxGaWxlcyh0cnVlKQogICAgICwgbV9sb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkoZmFsc2Up CiAgICAgLCBtX2xvYWRzU2l0ZUljb25zSWdub3JpbmdJbWFnZUxvYWRpbmdTZXR0aW5nKGZhbHNl KQogICAgICwgbV9wcml2YXRlQnJvd3NpbmdFbmFibGVkKGZhbHNlKQpAQCAtNDMwLDYgKzQzMSwx MSBAQCB2b2lkIFNldHRpbmdzOjpzZXRKYXZhRW5hYmxlZChib29sIGlzSmF2YUVuYWJsZWQpCiAg ICAgbV9pc0phdmFFbmFibGVkID0gaXNKYXZhRW5hYmxlZDsKIH0KIAordm9pZCBTZXR0aW5nczo6 c2V0SmF2YUVuYWJsZWRGb3JMb2NhbEZpbGVzKGJvb2wgaXNKYXZhRW5hYmxlZEZvckxvY2FsRmls ZXMpCit7CisgICAgbV9pc0phdmFFbmFibGVkRm9yTG9jYWxGaWxlcyA9IGlzSmF2YUVuYWJsZWRG b3JMb2NhbEZpbGVzOworfQorCiB2b2lkIFNldHRpbmdzOjpzZXRJbWFnZXNFbmFibGVkKGJvb2wg YXJlSW1hZ2VzRW5hYmxlZCkKIHsKICAgICBtX2FyZUltYWdlc0VuYWJsZWQgPSBhcmVJbWFnZXNF bmFibGVkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCmluZGV4IDA4YWM1OTg5ZWJkYTkxOTdkNjIwZmQy OWE5MGVkNjU1OTYxMmQyNDkuLmEwMmEyMzY4NjI2YTQ5OTc1YTE4ZTk4N2YwOTA0ZjZiNDZkOThj ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKQEAgLTE0Myw2ICsxNDMsMTAgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogICAgICAgICB2b2lkIHNldEphdmFFbmFibGVkKGJvb2wpOwogICAgICAgICBi b29sIGlzSmF2YUVuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2lzSmF2YUVuYWJsZWQ7IH0KIAor ICAgICAgICAvLyBUaGlzIHNldHRpbmdzIGlzIG9ubHkgY29uc3VsdGVkIGlmIGlzSmF2YUVuYWJs ZWQoKSByZXR1cm5zIHRydWU7CisgICAgICAgIHZvaWQgc2V0SmF2YUVuYWJsZWRGb3JMb2NhbEZp bGVzKGJvb2wpOworICAgICAgICBib29sIGlzSmF2YUVuYWJsZWRGb3JMb2NhbEZpbGVzKCkgY29u c3QgeyByZXR1cm4gbV9pc0phdmFFbmFibGVkRm9yTG9jYWxGaWxlczsgfQorCiAgICAgICAgIHZv aWQgc2V0SW1hZ2VzRW5hYmxlZChib29sKTsKICAgICAgICAgYm9vbCBhcmVJbWFnZXNFbmFibGVk KCkgY29uc3QgeyByZXR1cm4gbV9hcmVJbWFnZXNFbmFibGVkOyB9CiAKQEAgLTU4MSw2ICs1ODUs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHVuc2lnbmVkIG1fbWF4aW11bUhUTUxQ YXJzZXJET01UcmVlRGVwdGg7CiAgICAgICAgIGJvb2wgbV9pc1NwYXRpYWxOYXZpZ2F0aW9uRW5h YmxlZCA6IDE7CiAgICAgICAgIGJvb2wgbV9pc0phdmFFbmFibGVkIDogMTsKKyAgICAgICAgYm9v bCBtX2lzSmF2YUVuYWJsZWRGb3JMb2NhbEZpbGVzIDogMTsKICAgICAgICAgYm9vbCBtX2xvYWRz SW1hZ2VzQXV0b21hdGljYWxseSA6IDE7CiAgICAgICAgIGJvb2wgbV9sb2Fkc1NpdGVJY29uc0ln bm9yaW5nSW1hZ2VMb2FkaW5nU2V0dGluZyA6IDE7CiAgICAgICAgIGJvb2wgbV9wcml2YXRlQnJv d3NpbmdFbmFibGVkIDogMTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQ cmVmZXJlbmNlc1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNT dG9yZS5oCmluZGV4IDBlODZkODU2ZWU1Y2IyZmRmZmY4M2Q0ODFkYzBlNWYyYmY0YWI2MzYuLjhj YzJiMjM5NjdjNTFmYzQ2YTk1NTNmNzU2M2FkODA2ZjA4MjVmZDkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmgKKysrIGIvU291cmNlL1dlYktp dDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaApAQCAtNTQsNiArNTQsNyBAQCBuYW1lc3Bh Y2UgV2ViS2l0IHsKICAgICBtYWNybyhMb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VMb2FkaW5n UHJlZmVyZW5jZSwgbG9hZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1ByZWZlcmVuY2Us IEJvb2wsIGJvb2wsIGZhbHNlKSBcCiAgICAgbWFjcm8oUGx1Z2luc0VuYWJsZWQsIHBsdWdpbnNF bmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBcCiAgICAgbWFjcm8oSmF2YUVuYWJsZWQsIGphdmFF bmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBcCisgICAgbWFjcm8oSmF2YUVuYWJsZWRGb3JMb2Nh bEZpbGVzLCBqYXZhRW5hYmxlZEZvckxvY2FsRmlsZXMsIEJvb2wsIGJvb2wsIHRydWUpIFwKICAg ICBtYWNybyhPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQsIG9mZmxpbmVXZWJBcHBs aWNhdGlvbkNhY2hlRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhMb2Nh bFN0b3JhZ2VFbmFibGVkLCBsb2NhbFN0b3JhZ2VFbmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBc CiAgICAgbWFjcm8oRGF0YWJhc2VzRW5hYmxlZCwgZGF0YWJhc2VzRW5hYmxlZCwgQm9vbCwgYm9v bCwgdHJ1ZSkgXApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dL UHJlZmVyZW5jZXMuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVy ZW5jZXMuY3BwCmluZGV4IDZjODk5ZjkzYzJmOGVmOTc5ZmEyZGUyMTExNWI0MmMwMGMyNzMyMjku LjJjMDQwNDU2M2NiMmY3MDEwODk2NmIyNjc4YWM3YTIxZjZhODdmYWYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKQEAgLTE1OCw2ICsx NTgsMTYgQEAgYm9vbCBXS1ByZWZlcmVuY2VzR2V0SmF2YUVuYWJsZWQoV0tQcmVmZXJlbmNlc1Jl ZiBwcmVmZXJlbmNlc1JlZikKICAgICByZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+amF2 YUVuYWJsZWQoKTsKIH0KIAordm9pZCBXS1ByZWZlcmVuY2VzU2V0SmF2YUVuYWJsZWRGb3JMb2Nh bEZpbGVzKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgamF2YUVuYWJsZWRG b3JMb2NhbEZpbGVzKQoreworICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldEphdmFFbmFi bGVkRm9yTG9jYWxGaWxlcyhqYXZhRW5hYmxlZEZvckxvY2FsRmlsZXMpOworfQorCitib29sIFdL UHJlZmVyZW5jZXNHZXRKYXZhRW5hYmxlZEZvckxvY2FsRmlsZXMoV0tQcmVmZXJlbmNlc1JlZiBw cmVmZXJlbmNlc1JlZikKK3sKKyAgICByZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+amF2 YUVuYWJsZWRGb3JMb2NhbEZpbGVzKCk7Cit9CisKIHZvaWQgV0tQcmVmZXJlbmNlc1NldEphdmFT Y3JpcHRDYW5PcGVuV2luZG93c0F1dG9tYXRpY2FsbHkoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJl bmNlc1JlZiwgYm9vbCBqYXZhU2NyaXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5KQogewog ICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldEphdmFTY3JpcHRDYW5PcGVuV2luZG93c0F1 dG9tYXRpY2FsbHkoamF2YVNjcmlwdENhbk9wZW5XaW5kb3dzQXV0b21hdGljYWxseSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZh dGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUHJpdmF0 ZS5oCmluZGV4IDViZDk2ZDVmYjg5MDhhNjljMWQ2ODQxN2VjZDZjMDI3MmVjZjY5MDkuLjE2ZDc0 ZTZhOTJjZDgxMjI1ZjU2OTIzYjIyMzliZjA3YjhlZjNmZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5oCkBAIC0xNzUs NiArMTc1LDEwIEBAIFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRBcHBsaWNhdGlvbkNo cm9tZU1vZGVFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlCiBXS19FWFBPUlQgdm9pZCBXS1By ZWZlcmVuY2VzU2V0SW5zcGVjdG9yVXNlc1dlYktpdFVzZXJJbnRlcmZhY2UoV0tQcmVmZXJlbmNl c1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBlbmFibGVkKTsKIFdLX0VYUE9SVCBib29sIFdLUHJl ZmVyZW5jZXNHZXRJbnNwZWN0b3JVc2VzV2ViS2l0VXNlckludGVyZmFjZShXS1ByZWZlcmVuY2Vz UmVmIHByZWZlcmVuY2VzUmVmKTsKIAorLy8gRGVmYXVsdHMgdG8gdHJ1ZS4KK1dLX0VYUE9SVCB2 b2lkIFdLUHJlZmVyZW5jZXNTZXRKYXZhRW5hYmxlZEZvckxvY2FsRmlsZXMoV0tQcmVmZXJlbmNl c1JlZiBwcmVmZXJlbmNlcywgYm9vbCBqYXZhRW5hYmxlZCk7CitXS19FWFBPUlQgYm9vbCBXS1By ZWZlcmVuY2VzR2V0SmF2YUVuYWJsZWRGb3JMb2NhbEZpbGVzKFdLUHJlZmVyZW5jZXNSZWYgcHJl ZmVyZW5jZXMpOworCiBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzUmVzZXRUZXN0UnVubmVy T3ZlcnJpZGVzKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpOwogCiAjaWZkZWYgX19j cGx1c3BsdXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cAppbmRleCA5ZjhmYjhlMjQ2YjExYjQyMGRlZWYwYzhkMTljZDE2ZWMwMGE5MDA5Li45ZjJmY2Q5 OTc3N2U5YTAyZDhmZWZmNTM4OTczMWZlOGY2ZDMxMjE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0xODczLDYgKzE4NzMsNyBAQCB2b2lk IFdlYlBhZ2U6OnVwZGF0ZVByZWZlcmVuY2VzKGNvbnN0IFdlYlByZWZlcmVuY2VzU3RvcmUmIHN0 b3JlKQogICAgIHNldHRpbmdzLT5zZXRMb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VMb2FkaW5n U2V0dGluZyhzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmxvYWRz U2l0ZUljb25zSWdub3JpbmdJbWFnZUxvYWRpbmdQcmVmZXJlbmNlS2V5KCkpKTsKICAgICBzZXR0 aW5ncy0+c2V0UGx1Z2luc0VuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZl cmVuY2VzS2V5OjpwbHVnaW5zRW5hYmxlZEtleSgpKSk7CiAgICAgc2V0dGluZ3MtPnNldEphdmFF bmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6amF2YUVu YWJsZWRLZXkoKSkpOworICAgIHNldHRpbmdzLT5zZXRKYXZhRW5hYmxlZEZvckxvY2FsRmlsZXMo c3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpqYXZhRW5hYmxlZEZv ckxvY2FsRmlsZXNLZXkoKSkpOyAgICAKICAgICBzZXR0aW5ncy0+c2V0T2ZmbGluZVdlYkFwcGxp Y2F0aW9uQ2FjaGVFbmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNl c0tleTo6b2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkS2V5KCkpKTsKICAgICBzZXR0 aW5ncy0+c2V0TG9jYWxTdG9yYWdlRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2Vi UHJlZmVyZW5jZXNLZXk6OmxvY2FsU3RvcmFnZUVuYWJsZWRLZXkoKSkpOwogICAgIHNldHRpbmdz LT5zZXRYU1NBdWRpdG9yRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVy ZW5jZXNLZXk6Onhzc0F1ZGl0b3JFbmFibGVkS2V5KCkpKTsK