111907 2013-03-08 17:41:03 -0800 [HTMLTemplateElement] EOF should unwind the stack of template insertion modes iteratively 2013-03-13 17:05:50 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 103547 1 rafaelw rafaelw abarth adamk buildbot dglazkov eric esprehn+autocc ojan.autocc rniwa webkit.review.bot oldest_to_newest 851651 0 rafaelw 2013-03-08 17:41:03 -0800 The current implementation follows the previous spec language of unwinding all open templates immediately. The new language calls for other insertion modes to act as if a </template> had been seen, then reprocess the EOF (which is more consistent with existing parser mechanisms). There should be no observable difference between the two implementations, but we keep our parser inline with the spec, so this patch reflects the new spec language. 851653 1 192317 rafaelw 2013-03-08 17:44:18 -0800 Created attachment 192317 Patch 851654 2 192317 adamk 2013-03-08 17:49:23 -0800 Comment on attachment 192317 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=192317&action=review > Source/WebCore/html/parser/HTMLTreeBuilder.cpp:977 > + processTemplateEndTag(token); Don't you want to process a fake template end tag instead of passing an EndOfFile token through to processTemplateEndTag? That seems like the usual thing to do in this situation... 851657 3 192317 rafaelw 2013-03-08 17:59:17 -0800 Comment on attachment 192317 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=192317&action=review >> Source/WebCore/html/parser/HTMLTreeBuilder.cpp:977 >> + processTemplateEndTag(token); > > Don't you want to process a fake template end tag instead of passing an EndOfFile token through to processTemplateEndTag? That seems like the usual thing to do in this situation... That's what happens. The token is only used if there is a parseError. This isn't really helpful since our parserError(token) doesn't do anything. I realize this is confusing. processTemplateEndTag can be called with either a </template> or an EOF. It should be impossible to hit the parse error in the EOF case, but that doesn't help needing the token. 851666 4 192317 webkit.review.bot 2013-03-08 18:34:20 -0800 Comment on attachment 192317 Patch Attachment 192317 did not pass chromium-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/17017418 New failing tests: fast/dom/HTMLTemplateElement/innerHTML-inert.html fast/dom/HTMLTemplateElement/innerHTML.html 851686 5 abarth 2013-03-08 19:35:31 -0800 Looks like you've got some failing tests to work through. 851767 6 192317 buildbot 2013-03-09 02:41:52 -0800 Comment on attachment 192317 Patch Attachment 192317 did not pass mac-ews (mac): Output: http://webkit-commit-queue.appspot.com/results/17047655 New failing tests: editing/selection/selection-modify-crash.html 852865 7 192591 rafaelw 2013-03-11 16:41:47 -0700 Created attachment 192591 Patch 852866 8 rafaelw 2013-03-11 16:41:59 -0700 Fixed template.innerHTML case 854787 9 193023 rafaelw 2013-03-13 16:37:15 -0700 Created attachment 193023 Patch 854788 10 rafaelw 2013-03-13 16:38:14 -0700 PTAL. Note that the spec bug has been resolved here: https://www.w3.org/Bugs/Public/show_bug.cgi?id=20924 854790 11 193023 abarth 2013-03-13 16:40:08 -0700 Comment on attachment 193023 Patch ok 854801 12 193023 webkit.review.bot 2013-03-13 17:05:45 -0700 Comment on attachment 193023 Patch Clearing flags on attachment: 193023 Committed r145772: <http://trac.webkit.org/changeset/145772> 854802 13 webkit.review.bot 2013-03-13 17:05:50 -0700 All reviewed patches have been landed. Closing bug. 192317 2013-03-08 17:44:18 -0800 2013-03-11 16:41:45 -0700 Patch bug-111907-20130308174021.patch text/plain 6172 rafaelw U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MjkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzNmYWQwMTIxMjcyODQ3 NmYzOTUxNmZhYjdkNWZkYmZkZDIxNjQ1NC4uNGVjMDQxYjA1ZDAzNzE1MzNjNDY1YTMyMWFhYWI4 OTE5NzFiOWRlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDEzLTAzLTA4ICBSYWZh ZWwgV2VpbnN0ZWluICA8cmFmYWVsd0BjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgW0hUTUxUZW1w bGF0ZUVsZW1lbnRdIEVPRiBzaG91bGQgdW53aW5kIHRoZSBzdGFjayBvZiB0ZW1wbGF0ZSBpbnNl cnRpb24gbW9kZXMgaXRlcmF0aXZlbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExMTkwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE5vIGJlaGF2aW9yYWwgY2hhbmdlcy4gVGhpcyBwYXRjaCBvbmx5IGFs aWducyBvdXIgcGFyc2VyIGltcGxlbWVudGF0aW9uIHdpdGggdGhlIHByZXNlbnQgc3BlYy4KKwor ICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NUZW1wbGF0ZUVuZFRhZyk6CisgICAgICAgIChX ZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRPZkZpbGVGb3JJblRlbXBsYXRlQ29u dGVudHMpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kT2ZG aWxlKToKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuaDoKKyAgICAgICAg KEhUTUxUcmVlQnVpbGRlcik6CisKKzIwMTMtMDMtMDggIFJhZmFlbCBXZWluc3RlaW4gIDxyYWZh ZWx3QGNocm9taXVtLm9yZz4KKwogICAgICAgICBbSFRNTFRlbXBsYXRlRWxlbWVudF0gcHJvY2Vz c1RlbXBsYXRlRW5kVGFnKCkgbmVlZHMgdG8gY2hlY2sgZm9yIHRlbXBsYXRlIGluIGh0bWwgc2Nv cGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTg4 MAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxk ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcApp bmRleCBiMWQwMjkzNjU5YjdjOWU1ODZmZjVhMGJjMTM0OTZhZWQ3MDdhMDFhLi5hZDU2NzQ3NmE3 Yjc1NTY0NWMxM2JjMGY5M2U3OTU3Zjk1M2Q1MzkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHAKQEAgLTk2NCwyOSArOTY0LDE4IEBAIHZvaWQg SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzVGVtcGxhdGVFbmRUYWcoQXRvbWljSFRNTFRva2VuKiB0 b2tlbikKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBtX3RyZWUuZ2VuZXJhdGVJbXBsaWVk RW5kVGFncygpOwotICAgIGlmICghbV90cmVlLmN1cnJlbnRTdGFja0l0ZW0oKS0+aGFzTG9jYWxO YW1lKHRva2VuLT5uYW1lKCkpKQorICAgIGlmICghbV90cmVlLmN1cnJlbnRTdGFja0l0ZW0oKS0+ aGFzVGFnTmFtZSh0ZW1wbGF0ZVRhZykpCiAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOwotICAg IG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+cG9wVW50aWxQb3BwZWQodG9rZW4tPm5hbWUoKSk7Cisg ICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5wb3BVbnRpbFBvcHBlZCh0ZW1wbGF0ZVRhZy5sb2Nh bE5hbWUoKSk7CiAgICAgbV90cmVlLmFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cygpLT5jbGVhclRv TGFzdE1hcmtlcigpOwogICAgIG1fdGVtcGxhdGVJbnNlcnRpb25Nb2Rlcy5yZW1vdmVMYXN0KCk7 CiAgICAgcmVzZXRJbnNlcnRpb25Nb2RlQXBwcm9wcmlhdGVseSgpOwogfQogCi1ib29sIEhUTUxU cmVlQnVpbGRlcjo6cG9wQWxsVGVtcGxhdGVzRm9yRW5kT2ZGaWxlKCkKK3ZvaWQgSFRNTFRyZWVC dWlsZGVyOjpwcm9jZXNzRW5kT2ZGaWxlRm9ySW5UZW1wbGF0ZUNvbnRlbnRzKEF0b21pY0hUTUxU b2tlbiogdG9rZW4pCiB7Ci0gICAgaWYgKG1fdGVtcGxhdGVJbnNlcnRpb25Nb2Rlcy5pc0VtcHR5 KCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIHdoaWxlICghbV90ZW1wbGF0ZUluc2Vy dGlvbk1vZGVzLmlzRW1wdHkoKSkgewotICAgICAgICBpZiAobV90cmVlLmN1cnJlbnRJc1Jvb3RO b2RlKCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIGlmIChtX3RyZWUuY3Vy cmVudE5vZGUoKS0+aGFzVGFnTmFtZSh0ZW1wbGF0ZVRhZykpCi0gICAgICAgICAgICBtX3RlbXBs YXRlSW5zZXJ0aW9uTW9kZXMucmVtb3ZlTGFzdCgpOwotICAgICAgICBtX3RyZWUub3BlbkVsZW1l bnRzKCktPnBvcCgpOwotICAgIH0KLQotICAgIHJlc2V0SW5zZXJ0aW9uTW9kZUFwcHJvcHJpYXRl bHkoKTsKLSAgICByZXR1cm4gdHJ1ZTsKKyAgICBwcm9jZXNzVGVtcGxhdGVFbmRUYWcodG9rZW4p OworICAgIHByb2Nlc3NFbmRPZkZpbGUodG9rZW4pOwogfQogI2VuZGlmCiAKQEAgLTI1NTgsOCAr MjU0Nyw4IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kT2ZGaWxlKEF0b21pY0hU TUxUb2tlbiogdG9rZW4pCiAjZW5kaWYKICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsgLy8gRW1p dCBwYXJzZSBlcnJvciBiYXNlZCBvbiB3aGF0IGVsZW1lbnRzIGFyZSBzdGlsbCBvcGVuLgogI2lm IEVOQUJMRShURU1QTEFURV9FTEVNRU5UKQotICAgICAgICBpZiAocG9wQWxsVGVtcGxhdGVzRm9y RW5kT2ZGaWxlKCkpIHsKLSAgICAgICAgICAgIHByb2Nlc3NFbmRPZkZpbGUodG9rZW4pOworICAg ICAgICBpZiAoIW1fdGVtcGxhdGVJbnNlcnRpb25Nb2Rlcy5pc0VtcHR5KCkpIHsKKyAgICAgICAg ICAgIHByb2Nlc3NFbmRPZkZpbGVGb3JJblRlbXBsYXRlQ29udGVudHModG9rZW4pOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9CiAjZW5kaWYKQEAgLTI1NzcsMTggKzI1NjYsNiBAQCB2 b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZE9mRmlsZShBdG9taWNIVE1MVG9rZW4qIHRv a2VuKQogICAgIGNhc2UgQWZ0ZXJBZnRlckZyYW1lc2V0TW9kZToKICAgICAgICAgQVNTRVJUKGlu c2VydGlvbk1vZGUoKSA9PSBBZnRlckZyYW1lc2V0TW9kZSB8fCBpbnNlcnRpb25Nb2RlKCkgPT0g QWZ0ZXJBZnRlckZyYW1lc2V0TW9kZSk7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgSW5Db2x1 bW5Hcm91cE1vZGU6Ci0gICAgICAgIGlmIChtX3RyZWUuY3VycmVudElzUm9vdE5vZGUoKSkgewot ICAgICAgICAgICAgQVNTRVJUKGlzUGFyc2luZ0ZyYWdtZW50KCkpOwotICAgICAgICAgICAgcmV0 dXJuOyAvLyBGSVhNRTogU2hvdWxkIHdlIGJyZWFrIGhlcmUgaW5zdGVhZCBvZiByZXR1cm5pbmc/ Ci0gICAgICAgIH0KLSNpZiBFTkFCTEUoVEVNUExBVEVfRUxFTUVOVCkKLSAgICAgICAgQVNTRVJU KG1fdHJlZS5jdXJyZW50Tm9kZSgpLT5oYXNUYWdOYW1lKGNvbGdyb3VwVGFnKSB8fCBtX3RyZWUu Y3VycmVudE5vZGUoKS0+aGFzVGFnTmFtZSh0ZW1wbGF0ZVRhZykpOwotI2Vsc2UKLSAgICAgICAg QVNTRVJUKG1fdHJlZS5jdXJyZW50Tm9kZSgpLT5oYXNUYWdOYW1lKGNvbGdyb3VwVGFnKSk7Ci0j ZW5kaWYKLSAgICAgICAgcHJvY2Vzc0NvbGdyb3VwRW5kVGFnRm9ySW5Db2x1bW5Hcm91cCgpOwot ICAgICAgICAvLyBGYWxsIHRocm91Z2gKICAgICBjYXNlIEluRnJhbWVzZXRNb2RlOgogICAgIGNh c2UgSW5UYWJsZU1vZGU6CiAgICAgY2FzZSBJblRhYmxlQm9keU1vZGU6CkBAIC0yNTk5LDEyICsy NTc2LDMzIEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kT2ZGaWxlKEF0b21pY0hU TUxUb2tlbiogdG9rZW4pCiAgICAgICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKIAogI2lmIEVO QUJMRShURU1QTEFURV9FTEVNRU5UKQotICAgICAgICBpZiAocG9wQWxsVGVtcGxhdGVzRm9yRW5k T2ZGaWxlKCkpIHsKLSAgICAgICAgICAgIHByb2Nlc3NFbmRPZkZpbGUodG9rZW4pOworICAgICAg ICBpZiAoIW1fdGVtcGxhdGVJbnNlcnRpb25Nb2Rlcy5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAg IHByb2Nlc3NFbmRPZkZpbGVGb3JJblRlbXBsYXRlQ29udGVudHModG9rZW4pOwogICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICB9CiAjZW5kaWYKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBJ bkNvbHVtbkdyb3VwTW9kZToKKyAgICAgICAgaWYgKG1fdHJlZS5jdXJyZW50SXNSb290Tm9kZSgp KSB7CisgICAgICAgICAgICBBU1NFUlQoaXNQYXJzaW5nRnJhZ21lbnQoKSk7CisgICAgICAgICAg ICByZXR1cm47IC8vIEZJWE1FOiBTaG91bGQgd2UgYnJlYWsgaGVyZSBpbnN0ZWFkIG9mIHJldHVy bmluZz8KKyAgICAgICAgfQorCisjaWYgRU5BQkxFKFRFTVBMQVRFX0VMRU1FTlQpCisgICAgICAg IGlmICghbV90ZW1wbGF0ZUluc2VydGlvbk1vZGVzLmlzRW1wdHkoKSkgeworICAgICAgICAgICAg cHJvY2Vzc0NvbGdyb3VwRW5kVGFnRm9ySW5Db2x1bW5Hcm91cCgpOworICAgICAgICAgICAgcHJv Y2Vzc0VuZE9mRmlsZUZvckluVGVtcGxhdGVDb250ZW50cyh0b2tlbik7CisgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgIH0KKyNlbmRpZgorCisgICAgICAgIGlmICghcHJvY2Vzc0NvbGdyb3Vw RW5kVGFnRm9ySW5Db2x1bW5Hcm91cCgpKSB7CisgICAgICAgICAgICBBU1NFUlQoaXNQYXJzaW5n RnJhZ21lbnRPclRlbXBsYXRlQ29udGVudHMoKSk7CisgICAgICAgICAgICByZXR1cm47IC8vIEZJ WE1FOiBTaG91bGQgd2UgYnJlYWsgaGVyZSBpbnN0ZWFkIG9mIHJldHVybmluZz8KKyAgICAgICAg fQorCisgICAgICAgIHByb2Nlc3NFbmRPZkZpbGUodG9rZW4pOworICAgICAgICByZXR1cm47CiAg ICAgY2FzZSBJblRhYmxlVGV4dE1vZGU6CiAgICAgICAgIGRlZmF1bHRGb3JJblRhYmxlVGV4dCgp OwogICAgICAgICBwcm9jZXNzRW5kT2ZGaWxlKHRva2VuKTsKQEAgLTI2MjAsMTIgKzI2MTgsOCBA QCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZE9mRmlsZShBdG9taWNIVE1MVG9rZW4q IHRva2VuKQogICAgICAgICByZXR1cm47CiAgICAgY2FzZSBUZW1wbGF0ZUNvbnRlbnRzTW9kZToK ICNpZiBFTkFCTEUoVEVNUExBVEVfRUxFTUVOVCkKLSAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7 Ci0gICAgICAgIGlmIChwb3BBbGxUZW1wbGF0ZXNGb3JFbmRPZkZpbGUoKSkgewotICAgICAgICAg ICAgcHJvY2Vzc0VuZE9mRmlsZSh0b2tlbik7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAg IH0KLSAgICAgICAgYnJlYWs7CisgICAgICAgIHByb2Nlc3NFbmRPZkZpbGVGb3JJblRlbXBsYXRl Q29udGVudHModG9rZW4pOworICAgICAgICByZXR1cm47CiAjZWxzZQogICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9w YXJzZXIvSFRNTFRyZWVCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1M VHJlZUJ1aWxkZXIuaAppbmRleCA3ZGJjODljNTRjZjZhMGEyOTkzOThiOTVlODdiNzIyNzI4OTUw YjA2Li43MjMwNjljMTc1M2QwNDdiNmEyZWFkZWQ0YWQwYWIzMTNmMGIwODNmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuaApAQCAtMTk1LDcgKzE5NSw3 IEBAIHByaXZhdGU6CiAjaWYgRU5BQkxFKFRFTVBMQVRFX0VMRU1FTlQpCiAgICAgdm9pZCBwcm9j ZXNzVGVtcGxhdGVTdGFydFRhZyhBdG9taWNIVE1MVG9rZW4qKTsKICAgICB2b2lkIHByb2Nlc3NU ZW1wbGF0ZUVuZFRhZyhBdG9taWNIVE1MVG9rZW4qKTsKLSAgICBib29sIHBvcEFsbFRlbXBsYXRl c0ZvckVuZE9mRmlsZSgpOworICAgIHZvaWQgcHJvY2Vzc0VuZE9mRmlsZUZvckluVGVtcGxhdGVD b250ZW50cyhBdG9taWNIVE1MVG9rZW4qKTsKICNlbmRpZgogCiAgICAgY2xhc3MgRnJhZ21lbnRQ YXJzaW5nQ29udGV4dCB7Cg== 192591 2013-03-11 16:41:47 -0700 2013-03-13 16:37:12 -0700 Patch bug-111907-20130311163747.patch text/plain 6677 rafaelw U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MzkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDk1ZmZiYzA1MGY5YTM0 YjFiZDQ4YTNiMTdhYTBlOGIwMWZhYTE1MS4uZDdhNzkxM2JjMjNiYzNlYWEzNmJlMGU0ZjRhZTBk N2E1ZTk0N2M2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAzLTA4ICBSYWZh ZWwgV2VpbnN0ZWluICA8cmFmYWVsd0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0hUTUxUZW1w bGF0ZUVsZW1lbnRdIEVPRiBzaG91bGQgdW53aW5kIHRoZSBzdGFjayBvZiB0ZW1wbGF0ZSBpbnNl cnRpb24gbW9kZXMgaXRlcmF0aXZlbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExMTkwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE5vIGJlaGF2aW9yYWwgY2hhbmdlcy4gVGhpcyBwYXRjaCBvbmx5IGFs aWducyBvdXIgcGFyc2VyIGltcGxlbWVudGF0aW9uIHdpdGggdGhlIHByZXNlbnQgc3BlYy4KKwor ICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NUZW1wbGF0ZUVuZFRhZyk6CisgICAgICAgIChX ZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRPZkZpbGVGb3JJblRlbXBsYXRlQ29u dGVudHMpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kT2ZG aWxlKToKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuaDoKKyAgICAgICAg KEhUTUxUcmVlQnVpbGRlcik6CisKIDIwMTMtMDMtMTEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hv cnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgQ2hyb21lQ2xpZW50LmggZG9lc27igJl0IG5lZWQg dG8gaW5jbHVkZSBSZW5kZXJTbmFwc2hvdHRlZFBsdWdJbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHAKaW5kZXggYjFkMDI5MzY1OWI3YzllNTg2ZmY1 YTBiYzEzNDk2YWVkNzA3YTAxYS4uZjE1ZDZmYmI1NWRmMGZkMzg3YTcxZWVlMGQzMDYxZjM0ODU2 NmFiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWls ZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIu Y3BwCkBAIC05NTksMzQgKzk1OSwyOCBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1Rl bXBsYXRlU3RhcnRUYWcoQXRvbWljSFRNTFRva2VuKiB0b2tlbikKIHZvaWQgSFRNTFRyZWVCdWls ZGVyOjpwcm9jZXNzVGVtcGxhdGVFbmRUYWcoQXRvbWljSFRNTFRva2VuKiB0b2tlbikKIHsKICAg ICBpZiAoIW1fdHJlZS5vcGVuRWxlbWVudHMoKS0+aGFzVGVtcGxhdGVJbkhUTUxTY29wZSgpKSB7 CisgICAgICAgIGlmIChpc1BhcnNpbmdGcmFnbWVudCgpICYmIG1fZnJhZ21lbnRDb250ZXh0LmNv bnRleHRFbGVtZW50KCktPmhhc1RhZ05hbWUodGVtcGxhdGVUYWcpKSB7CisgICAgICAgICAgICBB U1NFUlQobV90ZW1wbGF0ZUluc2VydGlvbk1vZGVzLnNpemUoKSA9PSAxKTsKKyAgICAgICAgICAg IG1fdGVtcGxhdGVJbnNlcnRpb25Nb2Rlcy5yZW1vdmVMYXN0KCk7CisgICAgICAgIH0KKwogICAg ICAgICBBU1NFUlQobV90ZW1wbGF0ZUluc2VydGlvbk1vZGVzLmlzRW1wdHkoKSk7CiAgICAgICAg IHBhcnNlRXJyb3IodG9rZW4pOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIG1fdHJlZS5n ZW5lcmF0ZUltcGxpZWRFbmRUYWdzKCk7Ci0gICAgaWYgKCFtX3RyZWUuY3VycmVudFN0YWNrSXRl bSgpLT5oYXNMb2NhbE5hbWUodG9rZW4tPm5hbWUoKSkpCisgICAgaWYgKCFtX3RyZWUuY3VycmVu dFN0YWNrSXRlbSgpLT5oYXNUYWdOYW1lKHRlbXBsYXRlVGFnKSkKICAgICAgICAgcGFyc2VFcnJv cih0b2tlbik7Ci0gICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5wb3BVbnRpbFBvcHBlZCh0b2tl bi0+bmFtZSgpKTsKKyAgICBtX3RyZWUub3BlbkVsZW1lbnRzKCktPnBvcFVudGlsUG9wcGVkKHRl bXBsYXRlVGFnLmxvY2FsTmFtZSgpKTsKICAgICBtX3RyZWUuYWN0aXZlRm9ybWF0dGluZ0VsZW1l bnRzKCktPmNsZWFyVG9MYXN0TWFya2VyKCk7CiAgICAgbV90ZW1wbGF0ZUluc2VydGlvbk1vZGVz LnJlbW92ZUxhc3QoKTsKICAgICByZXNldEluc2VydGlvbk1vZGVBcHByb3ByaWF0ZWx5KCk7CiB9 CiAKLWJvb2wgSFRNTFRyZWVCdWlsZGVyOjpwb3BBbGxUZW1wbGF0ZXNGb3JFbmRPZkZpbGUoKQor dm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRPZkZpbGVGb3JJblRlbXBsYXRlQ29udGVu dHMoQXRvbWljSFRNTFRva2VuKiB0b2tlbikKIHsKLSAgICBpZiAobV90ZW1wbGF0ZUluc2VydGlv bk1vZGVzLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgd2hpbGUgKCFt X3RlbXBsYXRlSW5zZXJ0aW9uTW9kZXMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGlmIChtX3RyZWUu Y3VycmVudElzUm9vdE5vZGUoKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAg aWYgKG1fdHJlZS5jdXJyZW50Tm9kZSgpLT5oYXNUYWdOYW1lKHRlbXBsYXRlVGFnKSkKLSAgICAg ICAgICAgIG1fdGVtcGxhdGVJbnNlcnRpb25Nb2Rlcy5yZW1vdmVMYXN0KCk7Ci0gICAgICAgIG1f dHJlZS5vcGVuRWxlbWVudHMoKS0+cG9wKCk7Ci0gICAgfQotCi0gICAgcmVzZXRJbnNlcnRpb25N b2RlQXBwcm9wcmlhdGVseSgpOwotICAgIHJldHVybiB0cnVlOworICAgIHByb2Nlc3NUZW1wbGF0 ZUVuZFRhZyh0b2tlbik7CisgICAgcHJvY2Vzc0VuZE9mRmlsZSh0b2tlbik7CiB9CiAjZW5kaWYK IApAQCAtMjU1OCw4ICsyNTUyLDggQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRP ZkZpbGUoQXRvbWljSFRNTFRva2VuKiB0b2tlbikKICNlbmRpZgogICAgICAgICBub3RJbXBsZW1l bnRlZCgpOyAvLyBFbWl0IHBhcnNlIGVycm9yIGJhc2VkIG9uIHdoYXQgZWxlbWVudHMgYXJlIHN0 aWxsIG9wZW4uCiAjaWYgRU5BQkxFKFRFTVBMQVRFX0VMRU1FTlQpCi0gICAgICAgIGlmIChwb3BB bGxUZW1wbGF0ZXNGb3JFbmRPZkZpbGUoKSkgewotICAgICAgICAgICAgcHJvY2Vzc0VuZE9mRmls ZSh0b2tlbik7CisgICAgICAgIGlmICghbV90ZW1wbGF0ZUluc2VydGlvbk1vZGVzLmlzRW1wdHko KSkgeworICAgICAgICAgICAgcHJvY2Vzc0VuZE9mRmlsZUZvckluVGVtcGxhdGVDb250ZW50cyh0 b2tlbik7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICNlbmRpZgpAQCAtMjU3Nywx OCArMjU3MSw2IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kT2ZGaWxlKEF0b21p Y0hUTUxUb2tlbiogdG9rZW4pCiAgICAgY2FzZSBBZnRlckFmdGVyRnJhbWVzZXRNb2RlOgogICAg ICAgICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IEFmdGVyRnJhbWVzZXRNb2RlIHx8IGluc2Vy dGlvbk1vZGUoKSA9PSBBZnRlckFmdGVyRnJhbWVzZXRNb2RlKTsKICAgICAgICAgYnJlYWs7Ci0g ICAgY2FzZSBJbkNvbHVtbkdyb3VwTW9kZToKLSAgICAgICAgaWYgKG1fdHJlZS5jdXJyZW50SXNS b290Tm9kZSgpKSB7Ci0gICAgICAgICAgICBBU1NFUlQoaXNQYXJzaW5nRnJhZ21lbnQoKSk7Ci0g ICAgICAgICAgICByZXR1cm47IC8vIEZJWE1FOiBTaG91bGQgd2UgYnJlYWsgaGVyZSBpbnN0ZWFk IG9mIHJldHVybmluZz8KLSAgICAgICAgfQotI2lmIEVOQUJMRShURU1QTEFURV9FTEVNRU5UKQot ICAgICAgICBBU1NFUlQobV90cmVlLmN1cnJlbnROb2RlKCktPmhhc1RhZ05hbWUoY29sZ3JvdXBU YWcpIHx8IG1fdHJlZS5jdXJyZW50Tm9kZSgpLT5oYXNUYWdOYW1lKHRlbXBsYXRlVGFnKSk7Ci0j ZWxzZQotICAgICAgICBBU1NFUlQobV90cmVlLmN1cnJlbnROb2RlKCktPmhhc1RhZ05hbWUoY29s Z3JvdXBUYWcpKTsKLSNlbmRpZgotICAgICAgICBwcm9jZXNzQ29sZ3JvdXBFbmRUYWdGb3JJbkNv bHVtbkdyb3VwKCk7Ci0gICAgICAgIC8vIEZhbGwgdGhyb3VnaAogICAgIGNhc2UgSW5GcmFtZXNl dE1vZGU6CiAgICAgY2FzZSBJblRhYmxlTW9kZToKICAgICBjYXNlIEluVGFibGVCb2R5TW9kZToK QEAgLTI1OTksMTIgKzI1ODEsMzMgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRP ZkZpbGUoQXRvbWljSFRNTFRva2VuKiB0b2tlbikKICAgICAgICAgICAgIHBhcnNlRXJyb3IodG9r ZW4pOwogCiAjaWYgRU5BQkxFKFRFTVBMQVRFX0VMRU1FTlQpCi0gICAgICAgIGlmIChwb3BBbGxU ZW1wbGF0ZXNGb3JFbmRPZkZpbGUoKSkgewotICAgICAgICAgICAgcHJvY2Vzc0VuZE9mRmlsZSh0 b2tlbik7CisgICAgICAgIGlmICghbV90ZW1wbGF0ZUluc2VydGlvbk1vZGVzLmlzRW1wdHkoKSkg eworICAgICAgICAgICAgcHJvY2Vzc0VuZE9mRmlsZUZvckluVGVtcGxhdGVDb250ZW50cyh0b2tl bik7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICNlbmRpZgogICAgICAgICBicmVh azsKKyAgICBjYXNlIEluQ29sdW1uR3JvdXBNb2RlOgorICAgICAgICBpZiAobV90cmVlLmN1cnJl bnRJc1Jvb3ROb2RlKCkpIHsKKyAgICAgICAgICAgIEFTU0VSVChpc1BhcnNpbmdGcmFnbWVudCgp KTsKKyAgICAgICAgICAgIHJldHVybjsgLy8gRklYTUU6IFNob3VsZCB3ZSBicmVhayBoZXJlIGlu c3RlYWQgb2YgcmV0dXJuaW5nPworICAgICAgICB9CisKKyNpZiBFTkFCTEUoVEVNUExBVEVfRUxF TUVOVCkKKyAgICAgICAgaWYgKCFtX3RlbXBsYXRlSW5zZXJ0aW9uTW9kZXMuaXNFbXB0eSgpKSB7 CisgICAgICAgICAgICBwcm9jZXNzQ29sZ3JvdXBFbmRUYWdGb3JJbkNvbHVtbkdyb3VwKCk7Cisg ICAgICAgICAgICBwcm9jZXNzRW5kT2ZGaWxlRm9ySW5UZW1wbGF0ZUNvbnRlbnRzKHRva2VuKTsK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorI2VuZGlmCisKKyAgICAgICAgaWYgKCFw cm9jZXNzQ29sZ3JvdXBFbmRUYWdGb3JJbkNvbHVtbkdyb3VwKCkpIHsKKyAgICAgICAgICAgIEFT U0VSVChpc1BhcnNpbmdGcmFnbWVudE9yVGVtcGxhdGVDb250ZW50cygpKTsKKyAgICAgICAgICAg IHJldHVybjsgLy8gRklYTUU6IFNob3VsZCB3ZSBicmVhayBoZXJlIGluc3RlYWQgb2YgcmV0dXJu aW5nPworICAgICAgICB9CisKKyAgICAgICAgcHJvY2Vzc0VuZE9mRmlsZSh0b2tlbik7CisgICAg ICAgIHJldHVybjsKICAgICBjYXNlIEluVGFibGVUZXh0TW9kZToKICAgICAgICAgZGVmYXVsdEZv ckluVGFibGVUZXh0KCk7CiAgICAgICAgIHByb2Nlc3NFbmRPZkZpbGUodG9rZW4pOwpAQCAtMjYy MCwxMiArMjYyMywxMyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZE9mRmlsZShB dG9taWNIVE1MVG9rZW4qIHRva2VuKQogICAgICAgICByZXR1cm47CiAgICAgY2FzZSBUZW1wbGF0 ZUNvbnRlbnRzTW9kZToKICNpZiBFTkFCTEUoVEVNUExBVEVfRUxFTUVOVCkKLSAgICAgICAgcGFy c2VFcnJvcih0b2tlbik7Ci0gICAgICAgIGlmIChwb3BBbGxUZW1wbGF0ZXNGb3JFbmRPZkZpbGUo KSkgewotICAgICAgICAgICAgcHJvY2Vzc0VuZE9mRmlsZSh0b2tlbik7CisgICAgICAgIGlmICgh bV90ZW1wbGF0ZUluc2VydGlvbk1vZGVzLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgcHJvY2Vz c0NvbGdyb3VwRW5kVGFnRm9ySW5Db2x1bW5Hcm91cCgpOworICAgICAgICAgICAgcHJvY2Vzc0Vu ZE9mRmlsZUZvckluVGVtcGxhdGVDb250ZW50cyh0b2tlbik7CiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KLSAgICAgICAgYnJlYWs7CisgICAgICAgIEFTU0VSVChpc1BhcnNpbmdGcmFn bWVudCgpKTsKKyAgICAgICAgcmV0dXJuOwogI2Vsc2UKICAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hU TUxUcmVlQnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWls ZGVyLmgKaW5kZXggN2RiYzg5YzU0Y2Y2YTBhMjk5Mzk4Yjk1ZTg3YjcyMjcyODk1MGIwNi4uNzIz MDY5YzE3NTNkMDQ3YjZhMmVhZGVkNGFkMGFiMzEzZjBiMDgzZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmgKQEAgLTE5NSw3ICsxOTUsNyBAQCBwcml2 YXRlOgogI2lmIEVOQUJMRShURU1QTEFURV9FTEVNRU5UKQogICAgIHZvaWQgcHJvY2Vzc1RlbXBs YXRlU3RhcnRUYWcoQXRvbWljSFRNTFRva2VuKik7CiAgICAgdm9pZCBwcm9jZXNzVGVtcGxhdGVF bmRUYWcoQXRvbWljSFRNTFRva2VuKik7Ci0gICAgYm9vbCBwb3BBbGxUZW1wbGF0ZXNGb3JFbmRP ZkZpbGUoKTsKKyAgICB2b2lkIHByb2Nlc3NFbmRPZkZpbGVGb3JJblRlbXBsYXRlQ29udGVudHMo QXRvbWljSFRNTFRva2VuKik7CiAjZW5kaWYKIAogICAgIGNsYXNzIEZyYWdtZW50UGFyc2luZ0Nv bnRleHQgewo= 193023 2013-03-13 16:37:15 -0700 2013-03-13 17:05:44 -0700 Patch bug-111907-20130313163312.patch text/plain 5225 rafaelw U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1NzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDY5MzljNDViYjY3NTBj ZGM5MzdlZTg3MzMxMTIwNGIwZTQ0NWU2OC4uMjk4NzE2YWVkZTc4M2I0OGI5Y2Q5MzE5YjMxMGMy ZmEzNWFhYWYxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAzLTA4ICBSYWZh ZWwgV2VpbnN0ZWluICA8cmFmYWVsd0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0hUTUxUZW1w bGF0ZUVsZW1lbnRdIEVPRiBzaG91bGQgdW53aW5kIHRoZSBzdGFjayBvZiB0ZW1wbGF0ZSBpbnNl cnRpb24gbW9kZXMgaXRlcmF0aXZlbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExMTkwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE5vIGJlaGF2aW9yYWwgY2hhbmdlcy4gVGhpcyBwYXRjaCBvbmx5IGFs aWducyBvdXIgcGFyc2VyIGltcGxlbWVudGF0aW9uIHdpdGggdGhlIHByZXNlbnQgc3BlYy4KKwor ICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NUZW1wbGF0ZUVuZFRhZyk6CisgICAgICAgIChX ZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRPZkZpbGVGb3JJblRlbXBsYXRlQ29u dGVudHMpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kT2ZG aWxlKToKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuaDoKKyAgICAgICAg KEhUTUxUcmVlQnVpbGRlcik6CisKIDIwMTMtMDMtMTMgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9t aXVtLm9yZz4KIAogICAgICAgICBSZWdyZXNzaW9uKHIxNDM1NDIpOiAtd2Via2l0LWFsaWduLWl0 ZW1zOiBjZW50ZXIgd2l0aCBvdmVyZmxvdzogYXV0by9zY3JvbGwgaGFzIGV4dHJhIGJvdHRvbSBw YWRkaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1 aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNw cAppbmRleCBiMWQwMjkzNjU5YjdjOWU1ODZmZjVhMGJjMTM0OTZhZWQ3MDdhMDFhLi5hODFhMjA3 YmI5NzJjMGE3ODkzY2MxODgxMDJmOGYxODQwZTlhMTYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHAKQEAgLTk1NiwxMiArOTU2LDEzIEBAIHZv aWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzVGVtcGxhdGVTdGFydFRhZyhBdG9taWNIVE1MVG9r ZW4qIHRva2VuKQogICAgIHNldEluc2VydGlvbk1vZGUoVGVtcGxhdGVDb250ZW50c01vZGUpOwog fQogCi12b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1RlbXBsYXRlRW5kVGFnKEF0b21pY0hU TUxUb2tlbiogdG9rZW4pCitib29sIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1RlbXBsYXRlRW5k VGFnKEF0b21pY0hUTUxUb2tlbiogdG9rZW4pCiB7CisgICAgQVNTRVJUKHRva2VuLT5uYW1lKCkg PT0gdGVtcGxhdGVUYWcubG9jYWxOYW1lKCkpOwogICAgIGlmICghbV90cmVlLm9wZW5FbGVtZW50 cygpLT5oYXNUZW1wbGF0ZUluSFRNTFNjb3BlKCkpIHsKLSAgICAgICAgQVNTRVJUKG1fdGVtcGxh dGVJbnNlcnRpb25Nb2Rlcy5pc0VtcHR5KCkpOworICAgICAgICBBU1NFUlQobV90ZW1wbGF0ZUlu c2VydGlvbk1vZGVzLmlzRW1wdHkoKSB8fCAobV90ZW1wbGF0ZUluc2VydGlvbk1vZGVzLnNpemUo KSA9PSAxICYmIG1fZnJhZ21lbnRDb250ZXh0LmNvbnRleHRFbGVtZW50KCktPmhhc1RhZ05hbWUo dGVtcGxhdGVUYWcpKSk7CiAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOwotICAgICAgICByZXR1 cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAgICAgbV90cmVlLmdlbmVyYXRlSW1w bGllZEVuZFRhZ3MoKTsKICAgICBpZiAoIW1fdHJlZS5jdXJyZW50U3RhY2tJdGVtKCktPmhhc0xv Y2FsTmFtZSh0b2tlbi0+bmFtZSgpKSkKQEAgLTk3MCwyMiArOTcxLDE2IEBAIHZvaWQgSFRNTFRy ZWVCdWlsZGVyOjpwcm9jZXNzVGVtcGxhdGVFbmRUYWcoQXRvbWljSFRNTFRva2VuKiB0b2tlbikK ICAgICBtX3RyZWUuYWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzKCktPmNsZWFyVG9MYXN0TWFya2Vy KCk7CiAgICAgbV90ZW1wbGF0ZUluc2VydGlvbk1vZGVzLnJlbW92ZUxhc3QoKTsKICAgICByZXNl dEluc2VydGlvbk1vZGVBcHByb3ByaWF0ZWx5KCk7CisgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJv b2wgSFRNTFRyZWVCdWlsZGVyOjpwb3BBbGxUZW1wbGF0ZXNGb3JFbmRPZkZpbGUoKQorYm9vbCBI VE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRPZkZpbGVGb3JJblRlbXBsYXRlQ29udGVudHMoQXRv bWljSFRNTFRva2VuKiB0b2tlbikKIHsKLSAgICBpZiAobV90ZW1wbGF0ZUluc2VydGlvbk1vZGVz LmlzRW1wdHkoKSkKKyAgICBBdG9taWNIVE1MVG9rZW4gZW5kVGVtcGxhdGUoSFRNTFRva2VuOjpF bmRUYWcsIHRlbXBsYXRlVGFnLmxvY2FsTmFtZSgpKTsKKyAgICBpZiAoIXByb2Nlc3NUZW1wbGF0 ZUVuZFRhZygmZW5kVGVtcGxhdGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICB3aGls ZSAoIW1fdGVtcGxhdGVJbnNlcnRpb25Nb2Rlcy5pc0VtcHR5KCkpIHsKLSAgICAgICAgaWYgKG1f dHJlZS5jdXJyZW50SXNSb290Tm9kZSgpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAg ICAgICBpZiAobV90cmVlLmN1cnJlbnROb2RlKCktPmhhc1RhZ05hbWUodGVtcGxhdGVUYWcpKQot ICAgICAgICAgICAgbV90ZW1wbGF0ZUluc2VydGlvbk1vZGVzLnJlbW92ZUxhc3QoKTsKLSAgICAg ICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5wb3AoKTsKLSAgICB9Ci0KLSAgICByZXNldEluc2Vy dGlvbk1vZGVBcHByb3ByaWF0ZWx5KCk7CisgICAgcHJvY2Vzc0VuZE9mRmlsZSh0b2tlbik7CiAg ICAgcmV0dXJuIHRydWU7CiB9CiAjZW5kaWYKQEAgLTI1NTgsMTAgKzI1NTMsOSBAQCB2b2lkIEhU TUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZE9mRmlsZShBdG9taWNIVE1MVG9rZW4qIHRva2VuKQog I2VuZGlmCiAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7IC8vIEVtaXQgcGFyc2UgZXJyb3IgYmFz ZWQgb24gd2hhdCBlbGVtZW50cyBhcmUgc3RpbGwgb3Blbi4KICNpZiBFTkFCTEUoVEVNUExBVEVf RUxFTUVOVCkKLSAgICAgICAgaWYgKHBvcEFsbFRlbXBsYXRlc0ZvckVuZE9mRmlsZSgpKSB7Ci0g ICAgICAgICAgICBwcm9jZXNzRW5kT2ZGaWxlKHRva2VuKTsKLSAgICAgICAgICAgIHJldHVybjsK LSAgICAgICAgfQorICAgICAgICBpZiAoIW1fdGVtcGxhdGVJbnNlcnRpb25Nb2Rlcy5pc0VtcHR5 KCkpCisgICAgICAgICAgICBpZiAocHJvY2Vzc0VuZE9mRmlsZUZvckluVGVtcGxhdGVDb250ZW50 cyh0b2tlbikpCisgICAgICAgICAgICAgICAgcmV0dXJuOwogI2VuZGlmCiAgICAgICAgIGJyZWFr OwogICAgIGNhc2UgQWZ0ZXJCb2R5TW9kZToKQEAgLTI1OTksMTAgKzI1OTMsOSBAQCB2b2lkIEhU TUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZE9mRmlsZShBdG9taWNIVE1MVG9rZW4qIHRva2VuKQog ICAgICAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7CiAKICNpZiBFTkFCTEUoVEVNUExBVEVfRUxF TUVOVCkKLSAgICAgICAgaWYgKHBvcEFsbFRlbXBsYXRlc0ZvckVuZE9mRmlsZSgpKSB7Ci0gICAg ICAgICAgICBwcm9jZXNzRW5kT2ZGaWxlKHRva2VuKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAg ICAgICAgfQorICAgICAgICBpZiAoIW1fdGVtcGxhdGVJbnNlcnRpb25Nb2Rlcy5pc0VtcHR5KCkp CisgICAgICAgICAgICBpZiAocHJvY2Vzc0VuZE9mRmlsZUZvckluVGVtcGxhdGVDb250ZW50cyh0 b2tlbikpCisgICAgICAgICAgICAgICAgcmV0dXJuOwogI2VuZGlmCiAgICAgICAgIGJyZWFrOwog ICAgIGNhc2UgSW5UYWJsZVRleHRNb2RlOgpAQCAtMjYyMCwxMSArMjYxMyw4IEBAIHZvaWQgSFRN TFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kT2ZGaWxlKEF0b21pY0hUTUxUb2tlbiogdG9rZW4pCiAg ICAgICAgIHJldHVybjsKICAgICBjYXNlIFRlbXBsYXRlQ29udGVudHNNb2RlOgogI2lmIEVOQUJM RShURU1QTEFURV9FTEVNRU5UKQotICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKLSAgICAgICAg aWYgKHBvcEFsbFRlbXBsYXRlc0ZvckVuZE9mRmlsZSgpKSB7Ci0gICAgICAgICAgICBwcm9jZXNz RW5kT2ZGaWxlKHRva2VuKTsKKyAgICAgICAgaWYgKHByb2Nlc3NFbmRPZkZpbGVGb3JJblRlbXBs YXRlQ29udGVudHModG9rZW4pKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9CiAgICAg ICAgIGJyZWFrOwogI2Vsc2UKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuaCBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5oCmluZGV4IDQ2ODE1MjAwNThh NzRlYWRkNWIyMWFjZDdmNzQ3MmY0ZmVhOTdkYTMuLmU0OGExOTY1NDk5YTg2ZDAwN2YzMDZkZDA4 MWY4MmNjNzMxZGM5YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hU TUxUcmVlQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUcmVl QnVpbGRlci5oCkBAIC0xOTYsOCArMTk2LDggQEAgcHJpdmF0ZToKIAogI2lmIEVOQUJMRShURU1Q TEFURV9FTEVNRU5UKQogICAgIHZvaWQgcHJvY2Vzc1RlbXBsYXRlU3RhcnRUYWcoQXRvbWljSFRN TFRva2VuKik7Ci0gICAgdm9pZCBwcm9jZXNzVGVtcGxhdGVFbmRUYWcoQXRvbWljSFRNTFRva2Vu Kik7Ci0gICAgYm9vbCBwb3BBbGxUZW1wbGF0ZXNGb3JFbmRPZkZpbGUoKTsKKyAgICBib29sIHBy b2Nlc3NUZW1wbGF0ZUVuZFRhZyhBdG9taWNIVE1MVG9rZW4qKTsKKyAgICBib29sIHByb2Nlc3NF bmRPZkZpbGVGb3JJblRlbXBsYXRlQ29udGVudHMoQXRvbWljSFRNTFRva2VuKik7CiAjZW5kaWYK IAogICAgIGNsYXNzIEZyYWdtZW50UGFyc2luZ0NvbnRleHQgewo=