41257 2010-06-27 00:15:28 -0700 HTML5 tree builder should be able to execute inline scripts 2010-06-27 01:38:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 abarth abarth commit-queue eric oldest_to_newest 243437 0 abarth 2010-06-27 00:15:28 -0700 HTML5 tree builder should be able to execute inline scripts 243438 1 59847 abarth 2010-06-27 00:18:45 -0700 Created attachment 59847 Patch 243439 2 abarth 2010-06-27 00:20:08 -0700 Looks like there's a few extra lines in this patch to handle comments, but that's probably not worth splitting out into a separate patch. 243440 3 59847 eric 2010-06-27 01:13:30 -0700 Comment on attachment 59847 Patch OK. I suspect this is not going to be our final data structure. :) 243441 4 59847 commit-queue 2010-06-27 01:38:34 -0700 Comment on attachment 59847 Patch Clearing flags on attachment: 59847 Committed r61966: <http://trac.webkit.org/changeset/61966> 243442 5 commit-queue 2010-06-27 01:38:39 -0700 All reviewed patches have been landed. Closing bug. 59847 2010-06-27 00:18:45 -0700 2010-06-27 01:38:34 -0700 Patch bug-41257-20100627001844.patch text/plain 10473 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDJhZjdhNGMyMjZkZDNiMmUxODFkNjNlYTRmZDlmZWJjNWNlOWU0Zi4uODc0ZjdlZGM5ODVmN2Q5 ODRiZDM0ZGIzYzM3NDE1NmVlYmEzYjU3NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MyBAQAorMjAxMC0wNi0yNyAgQWRh bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEhUTUw1IHRyZWUgYnVpbGRlciBzaG91bGQgYmUgYWJsZSB0 byBleGVjdXRlIGlubGluZSBzY3JpcHRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00MTI1NworCisgICAgICAgIFRoaXMgcGF0Y2ggaW1wbGVtZW50cyBl bm91Z2ggbWFjaGluZXJ5IHNvIHRoYXQgd2UgY2FuIGV4ZWN1dGUgaW5saW5lCisgICAgICAgIHNj cmlwdHMgaW4gZXh0cmVtZWx5IHNpbXBsZSBkb2N1bWVudHMgc3VjaCBhcyB0aGUgZm9sbG93aW5n OgorCisgICAgICAgIDxodG1sPgorICAgICAgICA8c2NyaXB0PgorICAgICAgICBhbGVydCgxKTsK KyAgICAgICAgPC9zY3JpcHQ+CisKKyAgICAgICAgVG8gZ2V0IHRoaXMgdG8gd29yaywgSSBoYWQg dG8gZmxlc2ggb3V0IGEgc3VycHJpc2luZyBhbW91bnQgb2YgdGhlIGRhdGEKKyAgICAgICAgc3Ry dWN0dXJlcyBmb3IgcHJvY2Vzc2luZyB0aGUgPGhlYWQ+LiAgTm8gdGVzdHMgYmVjYXVzZSB0aGlz IGlzCisgICAgICAgIGFscmVhZHkgY292ZXJlZCBieSBtb3N0IExheW91dFRlc3RzLgorCisgICAg ICAgICogaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRy ZWVCdWlsZGVyOjpIVE1MVHJlZUJ1aWxkZXIpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVC dWlsZGVyOjpjb25zdHJ1Y3RUcmVlRnJvbVRva2VuKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxU cmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVl QnVpbGRlcjo6cHJvY2Vzc0VuZFRhZyk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxk ZXI6OnByb2Nlc3NDaGFyYWN0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVy OjppbnNlcnRDb21tZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6aW5z ZXJ0RWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6Omluc2VydFNj cmlwdEVsZW1lbnQpOgorICAgICAgICAqIGh0bWwvSFRNTFRyZWVCdWlsZGVyLmg6CisgICAgICAg IChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OkVsZW1lbnRSZWNvcmQ6OkVsZW1lbnRSZWNvcmQp OgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpFbGVtZW50UmVjb3JkOjplbGVt ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6RWxlbWVudFJlY29yZDo6 bmV4dCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OkVsZW1lbnRSZWNvcmQ6 OnJlbGVhc2VOZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6RWxlbWVu dFJlY29yZDo6c2V0TmV4dCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OkVs ZW1lbnRTdGFjazo6cG9wKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6RWxl bWVudFN0YWNrOjpwdXNoKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6RWxl bWVudFN0YWNrOjp0b3ApOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpFbGVt ZW50U3RhY2s6OnJlbW92ZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OmN1 cnJlbnRFbGVtZW50KToKKwogMjAxMC0wNi0yNSAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQu b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWls ZGVyLmNwcAppbmRleCBiMjA0MmU2ZTA5MTQwZGZhMzVkZmRiN2E1NDAxNmFlMzdlMDE4MzkyLi4y Nzc3OGJkODIzMGMxN2M5ZTVjZmJkOTZjYzI3YTAxZjJiMmNlOWFkIDEwMDY0NAotLS0gYS9XZWJD b3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVC dWlsZGVyLmNwcApAQCAtMjYsOSArMjYsMTIgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNs dWRlICJIVE1MVHJlZUJ1aWxkZXIuaCIKIAorI2luY2x1ZGUgIkNvbW1lbnQuaCIKICNpbmNsdWRl ICJEb2N1bWVudEZyYWdtZW50LmgiCiAjaW5jbHVkZSAiRWxlbWVudC5oIgogI2luY2x1ZGUgIkZy YW1lLmgiCisjaW5jbHVkZSAiSFRNTEVsZW1lbnRGYWN0b3J5LmgiCisjaW5jbHVkZSAiSFRNTFNj cmlwdEVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MVG9rZW5pemVyLmgiCiAjaW5jbHVkZSAiSFRN TFRva2VuLmgiCiAjaW5jbHVkZSAiSFRNTERvY3VtZW50LmgiCkBAIC0zOCw2ICs0MSw3IEBACiAj aW5jbHVkZSAiTGVnYWN5SFRNTFRyZWVCdWlsZGVyLmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50 ZWQuaCIKICNpbmNsdWRlICJTY3JpcHRDb250cm9sbGVyLmgiCisjaW5jbHVkZSAiVGV4dC5oIgog I2luY2x1ZGUgPHd0Zi9VbnVzZWRQYXJhbS5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC02 MSw2ICs2NSw3IEBAIEhUTUxUcmVlQnVpbGRlcjo6SFRNTFRyZWVCdWlsZGVyKEhUTUxUb2tlbml6 ZXIqIHRva2VuaXplciwgSFRNTERvY3VtZW50KiBkb2N1bWVuCiAgICAgLCBtX3JlcG9ydEVycm9y cyhyZXBvcnRFcnJvcnMpCiAgICAgLCBtX2lzUGF1c2VkKGZhbHNlKQogICAgICwgbV9pbnNlcnRp b25Nb2RlKEluaXRpYWxNb2RlKQorICAgICwgbV9vcmlnaW5hbEluc2VydGlvbk1vZGUoSW5pdGlh bE1vZGUpCiAgICAgLCBtX3Rva2VuaXplcih0b2tlbml6ZXIpCiAgICAgLCBtX2xlZ2FjeVRyZWVC dWlsZGVyKG5ldyBMZWdhY3lIVE1MVHJlZUJ1aWxkZXIoZG9jdW1lbnQsIHJlcG9ydEVycm9ycykp CiAgICAgLCBtX2xhc3RTY3JpcHRFbGVtZW50U3RhcnRMaW5lKHVuaW5pdGlhbGl6ZWRMaW5lTnVt YmVyVmFsdWUpCkBAIC03Nyw2ICs4Miw3IEBAIEhUTUxUcmVlQnVpbGRlcjo6SFRNTFRyZWVCdWls ZGVyKEhUTUxUb2tlbml6ZXIqIHRva2VuaXplciwgRG9jdW1lbnRGcmFnbWVudCogZnJhCiAgICAg LCBtX3JlcG9ydEVycm9ycyhmYWxzZSkgLy8gRklYTUU6IFdoeSBub3QgcmVwb3J0IGVycm9ycyBp biBmcmFnbWVudHM/CiAgICAgLCBtX2lzUGF1c2VkKGZhbHNlKQogICAgICwgbV9pbnNlcnRpb25N b2RlKEluaXRpYWxNb2RlKQorICAgICwgbV9vcmlnaW5hbEluc2VydGlvbk1vZGUoSW5pdGlhbE1v ZGUpCiAgICAgLCBtX3Rva2VuaXplcih0b2tlbml6ZXIpCiAgICAgLCBtX2xlZ2FjeVRyZWVCdWls ZGVyKG5ldyBMZWdhY3lIVE1MVHJlZUJ1aWxkZXIoZnJhZ21lbnQsIHNjcmlwdGluZ1Blcm1pc3Np b24pKQogICAgICwgbV9sYXN0U2NyaXB0RWxlbWVudFN0YXJ0TGluZSh1bmluaXRpYWxpemVkTGlu ZU51bWJlclZhbHVlKQpAQCAtMzAxLDcgKzMwNyw4IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpw cm9jZXNzU3RhcnRUYWcoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgfQogICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGhlYWRUYWcpIHsKLSAg ICAgICAgICAgIG1faGVhZEVsZW1lbnQgPSBpbnNlcnRFbGVtZW50KHRva2VuKTsKKyAgICAgICAg ICAgIGluc2VydEVsZW1lbnQodG9rZW4pOworICAgICAgICAgICAgbV9oZWFkRWxlbWVudCA9IGN1 cnJlbnRFbGVtZW50KCk7CiAgICAgICAgICAgICBzZXRJbnNlcnRpb25Nb2RlKEluSGVhZE1vZGUp OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CkBAIC00NjAsOSArNDY3LDkgQEAgdm9p ZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWcoQXRvbWljSFRNTFRva2VuJiB0b2tlbikK ICAgICBjYXNlIEluSGVhZE5vc2NyaXB0TW9kZToKICAgICAgICAgQVNTRVJUKGluc2VydGlvbk1v ZGUoKSA9PSBJbkhlYWROb3NjcmlwdE1vZGUpOwogICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09 IG5vc2NyaXB0VGFnKSB7Ci0gICAgICAgICAgICBBU1NFUlQobV9vcGVuRWxlbWVudHMudG9wKCkt PnRhZ1FOYW1lKCkgPT0gbm9zY3JpcHRUYWcpOworICAgICAgICAgICAgQVNTRVJUKGN1cnJlbnRF bGVtZW50KCktPnRhZ1FOYW1lKCkgPT0gbm9zY3JpcHRUYWcpOwogICAgICAgICAgICAgbV9vcGVu RWxlbWVudHMucG9wKCk7Ci0gICAgICAgICAgICBBU1NFUlQobV9vcGVuRWxlbWVudHMudG9wKCkt PnRhZ1FOYW1lKCkgPT0gaGVhZFRhZyk7CisgICAgICAgICAgICBBU1NFUlQoY3VycmVudEVsZW1l bnQoKS0+dGFnUU5hbWUoKSA9PSBoZWFkVGFnKTsKICAgICAgICAgICAgIHNldEluc2VydGlvbk1v ZGUoSW5IZWFkTW9kZSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAgLTQ3Miw2 ICs0NzksMTggQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWcoQXRvbWljSFRN TFRva2VuJiB0b2tlbikKICAgICAgICAgfQogICAgICAgICBwcm9jZXNzRGVmYXVsdEZvckluSGVh ZE5vc2NyaXB0TW9kZSh0b2tlbik7CiAgICAgICAgIHByb2Nlc3NUb2tlbih0b2tlbik7CisgICAg Y2FzZSBUZXh0TW9kZToKKyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBzY3JpcHRUYWcpIHsK KyAgICAgICAgICAgIC8vIFBhdXNlIG91cnNlbHZlcyBzbyB0aGF0IHBhcnNpbmcgc3RvcHMgdW50 aWwgdGhlIHNjcmlwdCBjYW4gYmUgcHJvY2Vzc2VkIGJ5IHRoZSBjYWxsZXIuCisgICAgICAgICAg ICBtX2lzUGF1c2VkID0gdHJ1ZTsKKyAgICAgICAgICAgIEFTU0VSVChjdXJyZW50RWxlbWVudCgp LT50YWdRTmFtZSgpID09IHNjcmlwdFRhZyk7CisgICAgICAgICAgICBtX3NjcmlwdFRvUHJvY2Vz cyA9IGN1cnJlbnRFbGVtZW50KCk7CisgICAgICAgICAgICBtX29wZW5FbGVtZW50cy5wb3AoKTsK KyAgICAgICAgICAgIG1faW5zZXJ0aW9uTW9kZSA9IG1fb3JpZ2luYWxJbnNlcnRpb25Nb2RlOwor ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIG5vdEltcGxlbWVudGVkKCk7 CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7 CiAgICAgfQpAQCAtNDg2LDggKzUwNSwxMiBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vz c0NvbW1lbnQoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICBpbnNlcnRDb21tZW50KHRva2Vu KTsKIH0KIAotdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NDaGFyYWN0ZXIoQXRvbWljSFRN TFRva2VuJikKK3ZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzQ2hhcmFjdGVyKEF0b21pY0hU TUxUb2tlbiYgdG9rZW4pCiB7CisgICAgaWYgKGluc2VydGlvbk1vZGUoKSA9PSBUZXh0TW9kZSkg eworICAgICAgICBjdXJyZW50RWxlbWVudCgpLT5hZGRDaGlsZChUZXh0OjpjcmVhdGUobV9kb2N1 bWVudCwgdG9rZW4uY2hhcmFjdGVycygpKSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAg Ly8gRklYTUU6IFdlIG5lZWQgdG8gZmlndXJlIG91dCBob3cgdG8gaGFuZGxlIGVhY2ggY2hhcmFj dGVyIGluZGl2aWR1YWxseS4KICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQpAQCAtNTc0LDEzICs1 OTcsMTcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6Omluc2VydERvY3R5cGUoQXRvbWljSFRNTFRv a2VuJiB0b2tlbikKIAogdm9pZCBIVE1MVHJlZUJ1aWxkZXI6Omluc2VydENvbW1lbnQoQXRvbWlj SFRNTFRva2VuJiB0b2tlbikKIHsKLSAgICBBU1NFUlRfVU5VU0VEKHRva2VuLCB0b2tlbi50eXBl KCkgPT0gSFRNTFRva2VuOjpDb21tZW50KTsKKyAgICBBU1NFUlQodG9rZW4udHlwZSgpID09IEhU TUxUb2tlbjo6Q29tbWVudCk7CisgICAgUmVmUHRyPE5vZGU+IGVsZW1lbnQgPSBDb21tZW50Ojpj cmVhdGUobV9kb2N1bWVudCwgdG9rZW4uY29tbWVudCgpKTsKKyAgICBjdXJyZW50RWxlbWVudCgp LT5hZGRDaGlsZChlbGVtZW50KTsKIH0KIAotUGFzc1JlZlB0cjxFbGVtZW50PiBIVE1MVHJlZUJ1 aWxkZXI6Omluc2VydEVsZW1lbnQoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKK3ZvaWQgSFRNTFRy ZWVCdWlsZGVyOjppbnNlcnRFbGVtZW50KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiB7Ci0gICAg QVNTRVJUX1VOVVNFRCh0b2tlbiwgdG9rZW4udHlwZSgpID09IEhUTUxUb2tlbjo6U3RhcnRUYWcp OwotICAgIHJldHVybiAwOworICAgIEFTU0VSVCh0b2tlbi50eXBlKCkgPT0gSFRNTFRva2VuOjpT dGFydFRhZyk7CisgICAgUmVmUHRyPEVsZW1lbnQ+IGVsZW1lbnQgPSBIVE1MRWxlbWVudEZhY3Rv cnk6OmNyZWF0ZUhUTUxFbGVtZW50KFF1YWxpZmllZE5hbWUobnVsbEF0b20sIHRva2VuLm5hbWUo KSwgeGh0bWxOYW1lc3BhY2VVUkkpLCBtX2RvY3VtZW50LCAwKTsKKyAgICBjdXJyZW50RWxlbWVu dCgpLT5hZGRDaGlsZChlbGVtZW50KTsKKyAgICBtX29wZW5FbGVtZW50cy5wdXNoKGVsZW1lbnQu cmVsZWFzZSgpKTsKIH0KIAogdm9pZCBIVE1MVHJlZUJ1aWxkZXI6Omluc2VydENoYXJhY3RlcihV Q2hhciBjYykKQEAgLTYwMSw2ICs2MjgsMTIgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6Omluc2Vy dEdlbmVyaWNSYXdUZXh0RWxlbWVudChBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogdm9pZCBIVE1M VHJlZUJ1aWxkZXI6Omluc2VydFNjcmlwdEVsZW1lbnQoQXRvbWljSFRNTFRva2VuJiB0b2tlbikK IHsKICAgICBBU1NFUlRfVU5VU0VEKHRva2VuLCB0b2tlbi50eXBlKCkgPT0gSFRNTFRva2VuOjpT dGFydFRhZyk7CisgICAgUmVmUHRyPEhUTUxTY3JpcHRFbGVtZW50PiBlbGVtZW50ID0gSFRNTFNj cmlwdEVsZW1lbnQ6OmNyZWF0ZShzY3JpcHRUYWcsIG1fZG9jdW1lbnQsIHRydWUpOworICAgIGN1 cnJlbnRFbGVtZW50KCktPmFkZENoaWxkKGVsZW1lbnQpOworICAgIG1fb3BlbkVsZW1lbnRzLnB1 c2goZWxlbWVudC5yZWxlYXNlKCkpOworICAgIG1fdG9rZW5pemVyLT5zZXRTdGF0ZShIVE1MVG9r ZW5pemVyOjpTY3JpcHREYXRhU3RhdGUpOworICAgIG1fb3JpZ2luYWxJbnNlcnRpb25Nb2RlID0g bV9pbnNlcnRpb25Nb2RlOworICAgIG1faW5zZXJ0aW9uTW9kZSA9IFRleHRNb2RlOwogfQogCiB2 b2lkIEhUTUxUcmVlQnVpbGRlcjo6ZmluaXNoZWQoKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1s L0hUTUxUcmVlQnVpbGRlci5oIGIvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5oCmluZGV4 IDA4YzMyMGYyMTQwZGVkMGIyMWRhNjZmODFjYzQ1NWM1YWQ5NzRhMDcuLjRlOGVhY2Y1ZDQwZDkx MmE3YmViZDJkYTMyMjY2NDIwNzgzMDhmZGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VHJlZUJ1aWxkZXIuaAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmgKQEAgLTMw LDYgKzMwLDcgQEAKICNpbmNsdWRlICJIVE1MVG9rZW5pemVyLmgiCiAjaW5jbHVkZSA8d3RmL05v bmNvcHlhYmxlLmg+CiAjaW5jbHVkZSA8d3RmL093blB0ci5oPgorI2luY2x1ZGUgPHd0Zi9QYXNz T3duUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvUmVm UHRyLmg+CiAjaW5jbHVkZSA8d3RmL3VuaWNvZGUvVW5pY29kZS5oPgpAQCAtOTksMTIgKzEwMCw1 OCBAQCBwcml2YXRlOgogICAgICAgICBBZnRlckFmdGVyRnJhbWVzZXRNb2RlLAogICAgIH07CiAK KyAgICBjbGFzcyBFbGVtZW50UmVjb3JkIDogcHVibGljIE5vbmNvcHlhYmxlIHsKKyAgICBwdWJs aWM6CisgICAgICAgIEVsZW1lbnRSZWNvcmQoUGFzc1JlZlB0cjxFbGVtZW50PiBlbGVtZW50LCBQ YXNzT3duUHRyPEVsZW1lbnRSZWNvcmQ+IG5leHQpCisgICAgICAgICAgICA6IG1fZWxlbWVudChl bGVtZW50KQorICAgICAgICAgICAgLCBtX25leHQobmV4dCkKKyAgICAgICAgeworICAgICAgICB9 CisKKyAgICAgICAgRWxlbWVudCogZWxlbWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fZWxlbWVudC5n ZXQoKTsgfQorICAgICAgICBFbGVtZW50UmVjb3JkKiBuZXh0KCkgY29uc3QgeyByZXR1cm4gbV9u ZXh0LmdldCgpOyB9CisgICAgICAgIFBhc3NPd25QdHI8RWxlbWVudFJlY29yZD4gcmVsZWFzZU5l eHQoKSB7IHJldHVybiBtX25leHQucmVsZWFzZSgpOyB9CisgICAgICAgIHZvaWQgc2V0TmV4dChQ YXNzT3duUHRyPEVsZW1lbnRSZWNvcmQ+IG5leHQpIHsgbV9uZXh0ID0gbmV4dDsgfQorCisgICAg cHJpdmF0ZToKKyAgICAgICAgUmVmUHRyPEVsZW1lbnQ+IG1fZWxlbWVudDsKKyAgICAgICAgT3du UHRyPEVsZW1lbnRSZWNvcmQ+IG1fbmV4dDsKKyAgICB9OworCiAgICAgY2xhc3MgRWxlbWVudFN0 YWNrIDogcHVibGljIE5vbmNvcHlhYmxlIHsKICAgICBwdWJsaWM6Ci0gICAgICAgIHZvaWQgcG9w KCkgeyB9Ci0gICAgICAgIHZvaWQgcHVzaChQYXNzUmVmUHRyPEVsZW1lbnQ+KSB7IH0KLSAgICAg ICAgdm9pZCByZW1vdmUoRWxlbWVudCopIHsgfQotICAgICAgICBFbGVtZW50KiB0b3AoKSBjb25z dCB7IHJldHVybiAwOyB9CisgICAgICAgIHZvaWQgcG9wKCkKKyAgICAgICAgeworICAgICAgICAg ICAgbV90b3AgPSBtX3RvcC0+cmVsZWFzZU5leHQoKTsKKyAgICAgICAgfQorCisgICAgICAgIHZv aWQgcHVzaChQYXNzUmVmUHRyPEVsZW1lbnQ+IGVsZW1lbnQpCisgICAgICAgIHsKKyAgICAgICAg ICAgIG1fdG9wLnNldChuZXcgRWxlbWVudFJlY29yZChlbGVtZW50LCBtX3RvcC5yZWxlYXNlKCkp KTsKKyAgICAgICAgfQorCisgICAgICAgIEVsZW1lbnQqIHRvcCgpIGNvbnN0CisgICAgICAgIHsK KyAgICAgICAgICAgIHJldHVybiBtX3RvcC0+ZWxlbWVudCgpOworICAgICAgICB9CisKKyAgICAg ICAgdm9pZCByZW1vdmUoRWxlbWVudCogZWxlbWVudCkKKyAgICAgICAgeworICAgICAgICAgICAg aWYgKG1fdG9wLT5lbGVtZW50KCkgPT0gZWxlbWVudCkgeworICAgICAgICAgICAgICAgIHBvcCgp OworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIEVs ZW1lbnRSZWNvcmQqIHBvcyA9IG1fdG9wLmdldCgpOworICAgICAgICAgICAgd2hpbGUgKHBvcy0+ bmV4dCgpKSB7CisgICAgICAgICAgICAgICAgaWYgKHBvcy0+bmV4dCgpLT5lbGVtZW50KCkgPT0g ZWxlbWVudCkgeworICAgICAgICAgICAgICAgICAgICBwb3MtPnNldE5leHQocG9zLT5uZXh0KCkt PnJlbGVhc2VOZXh0KCkpOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICBwcml2YXRlOgorICAgICAg ICBPd25QdHI8RWxlbWVudFJlY29yZD4gbV90b3A7CiAgICAgfTsKIAogICAgIHZvaWQgcGFzc1Rv a2VuVG9MZWdhY3lQYXJzZXIoSFRNTFRva2VuJik7CkBAIC0xMjgsNyArMTc1LDcgQEAgcHJpdmF0 ZToKIAogICAgIHZvaWQgaW5zZXJ0RG9jdHlwZShBdG9taWNIVE1MVG9rZW4mKTsKICAgICB2b2lk IGluc2VydENvbW1lbnQoQXRvbWljSFRNTFRva2VuJik7Ci0gICAgUGFzc1JlZlB0cjxFbGVtZW50 PiBpbnNlcnRFbGVtZW50KEF0b21pY0hUTUxUb2tlbiYpOworICAgIHZvaWQgaW5zZXJ0RWxlbWVu dChBdG9taWNIVE1MVG9rZW4mKTsKICAgICB2b2lkIGluc2VydENoYXJhY3RlcihVQ2hhciBjYyk7 CiAgICAgdm9pZCBpbnNlcnRHZW5lcmljUkNEQVRBRWxlbWVudChBdG9taWNIVE1MVG9rZW4mKTsK ICAgICB2b2lkIGluc2VydEdlbmVyaWNSYXdUZXh0RWxlbWVudChBdG9taWNIVE1MVG9rZW4mKTsK QEAgLTEzNyw2ICsxODQsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgaW5zZXJ0SFRNTFN0YXJ0VGFn QmVmb3JlSFRNTChBdG9taWNIVE1MVG9rZW4mKTsKICAgICB2b2lkIGluc2VydEhUTUxTdGFydFRh Z0luQm9keShBdG9taWNIVE1MVG9rZW4mKTsKIAorICAgIEVsZW1lbnQqIGN1cnJlbnRFbGVtZW50 KCkgeyByZXR1cm4gbV9vcGVuRWxlbWVudHMudG9wKCk7IH0KKwogICAgIFJlZlB0cjxFbGVtZW50 PiBtX2hlYWRFbGVtZW50OwogICAgIEVsZW1lbnRTdGFjayBtX29wZW5FbGVtZW50czsKICAgICBi b29sIG1fZnJhbWVzZXRPazsKQEAgLTE1Nyw2ICsyMDYsNyBAQCBwcml2YXRlOgogICAgIGJvb2wg bV9pc1BhdXNlZDsKIAogICAgIEluc2VydGlvbk1vZGUgbV9pbnNlcnRpb25Nb2RlOworICAgIElu c2VydGlvbk1vZGUgbV9vcmlnaW5hbEluc2VydGlvbk1vZGU7CiAKICAgICAvLyBIVE1MNSBzcGVj IHJlcXVpcmVzIHRoYXQgd2UgYmUgYWJsZSB0byBjaGFuZ2UgdGhlIHN0YXRlIG9mIHRoZSB0b2tl bml6ZXIKICAgICAvLyBmcm9tIHdpdGhpbiBwYXJzZXIgYWN0aW9ucy4K