126775 2014-01-10 13:23:02 -0800 [WebGL] Correct uniform input validation for texture sampler uniforms 2014-01-11 19:57:57 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 122610 1 bfulgham bfulgham bfulgham commit-queue darin dino esprehn+autocc gyuyoung.kim kondapallykalyan roger_fong webkit-bug-importer oldest_to_newest 966547 0 bfulgham 2014-01-10 13:23:02 -0800 I noticed that https://sketchfab.com/show/d7d5a375d4bf4f91a522a1148dbd3f6a does not render properly in the nightly from 1-9-2013. JavaScript console indicates: WebGL: INVALID_VALUE: uniform1: invalid texture unit. 966549 1 bfulgham 2014-01-10 13:24:22 -0800 (In reply to comment #0) > WebGL: INVALID_VALUE: uniform1: invalid texture unit. Typo: I meant to say: WebGL: INVALID_VALUE: uniform1i: invalid texture unit. 966553 2 webkit-bug-importer 2014-01-10 13:25:41 -0800 <rdar://problem/15795320> 966578 3 bfulgham 2014-01-10 14:05:32 -0800 This stopped working in http://trac.webkit.org/changeset/157271. However, it looks like the new code is doing the right thing, and preventing us from walking past the end of the available texture units. 966612 4 220893 bfulgham 2014-01-10 15:00:55 -0800 Created attachment 220893 Patch 966614 5 bfulgham 2014-01-10 15:01:54 -0800 This was a bug in the way the Int32Array type was being accessed. The code was attempting to cast the Int32Array* to a GC3DInt*, which resulted in garbage. Also added a test case to help avoid this in the future. 966615 6 220893 dino 2014-01-10 15:11:46 -0800 Comment on attachment 220893 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=220893&action=review r+, but please copy into a new test. > Source/WebCore/ChangeLog:8 > + Revised webgl/1.0.2/resources/webgl_test_files/conformance/uniforms/uniform-samplers-test.html We shouldn't do that. We should try to keep the webgl/1.0.2 files in sync with Khronos. Instead, copy the test into fast/canvas/webgl and make the changes there. > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:4205 > + LOG(WebGL, "Calling WebGLRenderingContext::uniform1iv (Int32Array* Variation)"); Should we keep this in here? It might be really noisy. > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:4225 > + LOG(WebGL, "Calling WebGLRenderingContext::uniform1iv (GC3Dint* Variation)"); Ditto. 966620 7 bfulgham 2014-01-10 15:21:03 -0800 (In reply to comment #6) > (From update of attachment 220893 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=220893&action=review > > r+, but please copy into a new test. OK! > > Source/WebCore/ChangeLog:8 > > + Revised webgl/1.0.2/resources/webgl_test_files/conformance/uniforms/uniform-samplers-test.html > > We shouldn't do that. We should try to keep the webgl/1.0.2 files in sync with Khronos. Instead, copy the test into fast/canvas/webgl and make the changes there. Done. > > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:4205 > > + LOG(WebGL, "Calling WebGLRenderingContext::uniform1iv (Int32Array* Variation)"); > > Should we keep this in here? It might be really noisy. Removed. > > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:4225 > > + LOG(WebGL, "Calling WebGLRenderingContext::uniform1iv (GC3Dint* Variation)"); > > Ditto. Removed. 966621 8 bfulgham 2014-01-10 15:24:48 -0800 Committed r161684: <http://trac.webkit.org/changeset/161684> 966851 9 darin 2014-01-11 15:21:37 -0800 This patch seems to have added a test with no test results: fast/canvas/webgl/uniform-samplers-test.html Also, the test seems to be failing on my computer. 966852 10 bfulgham 2014-01-11 16:11:59 -0800 (In reply to comment #9) > This patch seems to have added a test with no test results: fast/canvas/webgl/uniform-samplers-test.html > > Also, the test seems to be failing on my computer. Fixing now. 966876 11 bfulgham 2014-01-11 19:35:21 -0800 Reopened to add missing test. 966877 12 220951 bfulgham 2014-01-11 19:36:15 -0800 Created attachment 220951 Patch 966883 13 bfulgham 2014-01-11 19:57:57 -0800 Committed r161794: <http://trac.webkit.org/changeset/161794> 220893 2014-01-10 15:00:55 -0800 2014-01-11 19:36:10 -0800 Patch bug-126775-20140110150054.patch text/plain 5074 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MTY3OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTAxLTEwICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJHTF0gQ29ycmVjdCB1 bmlmb3JtIGlucHV0IHZhbGlkYXRpb24gZm9yIHRleHR1cmUgc2FtcGxlciB1bmlmb3JtCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjY3NzUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXZpc2VkIHdlYmds LzEuMC4yL3Jlc291cmNlcy93ZWJnbF90ZXN0X2ZpbGVzL2NvbmZvcm1hbmNlL3VuaWZvcm1zL3Vu aWZvcm0tc2FtcGxlcnMtdGVzdC5odG1sCisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFJl bmRlcmluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250 ZXh0Ojp1bmlmb3JtMWl2KTogQWNjZXNzIEludDMyQXJyYXkgZGF0YSBwcm9wZXJseS4KKwogMjAx NC0wMS0xMCAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+CiAKICAgICAgICAg Q2xlYW4gdXAgYW5kIGZpeCBzb21lIGlzc3VlcyB3aXRoIHN0ZG91dCBmb3JtYXR0aW5nIG9mIGNv bnNvbGUgbWVzc2FnZXMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJl bmRlcmluZ0NvbnRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2Fu dmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAJKHJldmlzaW9uIDE2MTY3MCkKKysrIFNvdXJj ZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTQyMDIsMTQgKzQyMDIsMTYgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6 OnVuaWZvcm0xaShjbwogCiB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6dW5pZm9ybTFpdihj b25zdCBXZWJHTFVuaWZvcm1Mb2NhdGlvbiogbG9jYXRpb24sIEludDMyQXJyYXkqIHYsIEV4Y2Vw dGlvbkNvZGUmIGVjKQogeworICAgIExPRyhXZWJHTCwgIkNhbGxpbmcgV2ViR0xSZW5kZXJpbmdD b250ZXh0Ojp1bmlmb3JtMWl2IChJbnQzMkFycmF5KiBWYXJpYXRpb24pIik7CiAgICAgVU5VU0VE X1BBUkFNKGVjKTsKICAgICBpZiAoaXNDb250ZXh0TG9zdCgpIHx8ICF2YWxpZGF0ZVVuaWZvcm1Q YXJhbWV0ZXJzKCJ1bmlmb3JtMWl2IiwgbG9jYXRpb24sIHYsIDEpKQogICAgICAgICByZXR1cm47 CiAKICAgICBpZiAobG9jYXRpb24tPnR5cGUoKSA9PSBHcmFwaGljc0NvbnRleHQzRDo6U0FNUExF Ul8yRCB8fCBsb2NhdGlvbi0+dHlwZSgpID09IEdyYXBoaWNzQ29udGV4dDNEOjpTQU1QTEVSX0NV QkUpCiAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCB2LT5sZW5ndGgoKTsgKytpKSB7 Ci0gICAgICAgICAgICBpZiAoKChHQzNEaW50Kil2KVtpXSA+PSBzdGF0aWNfY2FzdDxpbnQ+KG1f dGV4dHVyZVVuaXRzLnNpemUoKSkpIHsKLSAgICAgICAgICAgICAgICBzeW50aGVzaXplR0xFcnJv cihHcmFwaGljc0NvbnRleHQzRDo6SU5WQUxJRF9WQUxVRSwgInVuaWZvcm0xaSIsICJpbnZhbGlk IHRleHR1cmUgdW5pdCIpOworICAgICAgICAgICAgaWYgKHYtPmRhdGEoKVtpXSA+PSBzdGF0aWNf Y2FzdDxpbnQ+KG1fdGV4dHVyZVVuaXRzLnNpemUoKSkpIHsKKyAgICAgICAgICAgICAgICBMT0co V2ViR0wsICJUZXh0dXJlIHVuaXQgc2l6ZT0lenUsIHZbJWRdPSVkLiBMb2NhdGlvbiB0eXBlID0g JTA0WC4iLCBtX3RleHR1cmVVbml0cy5zaXplKCksIGksIHYtPmRhdGEoKVtpXSwgbG9jYXRpb24t PnR5cGUoKSk7CisgICAgICAgICAgICAgICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250 ZXh0M0Q6OklOVkFMSURfVkFMVUUsICJ1bmlmb3JtMWl2IiwgImludmFsaWQgdGV4dHVyZSB1bml0 Iik7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogICAgICAgICB9CkBA IC00MjIwLDYgKzQyMjIsNyBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6dW5pZm9ybTFp dihjCiAKIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0Ojp1bmlmb3JtMWl2KGNvbnN0IFdlYkdM VW5pZm9ybUxvY2F0aW9uKiBsb2NhdGlvbiwgR0MzRGludCogdiwgR0MzRHNpemVpIHNpemUsIEV4 Y2VwdGlvbkNvZGUmIGVjKQogeworICAgIExPRyhXZWJHTCwgIkNhbGxpbmcgV2ViR0xSZW5kZXJp bmdDb250ZXh0Ojp1bmlmb3JtMWl2IChHQzNEaW50KiBWYXJpYXRpb24pIik7CiAgICAgVU5VU0VE X1BBUkFNKGVjKTsKICAgICBpZiAoaXNDb250ZXh0TG9zdCgpIHx8ICF2YWxpZGF0ZVVuaWZvcm1Q YXJhbWV0ZXJzKCJ1bmlmb3JtMWl2IiwgbG9jYXRpb24sIHYsIHNpemUsIDEpKQogICAgICAgICBy ZXR1cm47CkBAIC00MjI3LDcgKzQyMzAsNyBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6 dW5pZm9ybTFpdihjCiAgICAgaWYgKGxvY2F0aW9uLT50eXBlKCkgPT0gR3JhcGhpY3NDb250ZXh0 M0Q6OlNBTVBMRVJfMkQgfHwgbG9jYXRpb24tPnR5cGUoKSA9PSBHcmFwaGljc0NvbnRleHQzRDo6 U0FNUExFUl9DVUJFKQogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc3RhdGljX2Nh c3Q8dW5zaWduZWQ+KHNpemUpOyArK2kpIHsKICAgICAgICAgICAgIGlmICgoKEdDM0RpbnQqKXYp W2ldID49IHN0YXRpY19jYXN0PGludD4obV90ZXh0dXJlVW5pdHMuc2l6ZSgpKSkgewotICAgICAg ICAgICAgICAgIHN5bnRoZXNpemVHTEVycm9yKEdyYXBoaWNzQ29udGV4dDNEOjpJTlZBTElEX1ZB TFVFLCAidW5pZm9ybTFpIiwgImludmFsaWQgdGV4dHVyZSB1bml0Iik7CisgICAgICAgICAgICAg ICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0M0Q6OklOVkFMSURfVkFMVUUsICJ1 bmlmb3JtMWl2IiwgImludmFsaWQgdGV4dHVyZSB1bml0Iik7CiAgICAgICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICAgICAgfQogICAgICAgICB9CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjE2ODIp CisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBA QAorMjAxNC0wMS0xMCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KKworICAg ICAgICBbV2ViR0xdIENvcnJlY3QgdW5pZm9ybSBpbnB1dCB2YWxpZGF0aW9uIGZvciB0ZXh0dXJl IHNhbXBsZXIgdW5pZm9ybXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjY3NzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHdlYmdsLzEuMC4yL3Jlc291cmNlcy93ZWJnbF90ZXN0X2ZpbGVzL2NvbmZv cm1hbmNlL3VuaWZvcm1zL3VuaWZvcm0tc2FtcGxlcnMtdGVzdC5odG1sOiBBZGQgYQorICAgICAg ICB0ZXN0IHRoYXQgd2UgY2FuIHNldCBzYW1wbGVyIHVuaWZvcm1zIHVzaW5nIEludDMyQXJyYXkg dHlwZXMuCisKIDIwMTQtMDEtMTAgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Via2l0Lm9yZz4KIAog ICAgICAgICBNYWtlIGNsaXBwaW5nIHBhdGggZnJvbSBiYXNpYy1zaGFwZXMgcmVsYXRpdmUgdG8g PGJveD4gdmFsdWUKSW5kZXg6IExheW91dFRlc3RzL3dlYmdsLzEuMC4yL3Jlc291cmNlcy93ZWJn bF90ZXN0X2ZpbGVzL2NvbmZvcm1hbmNlL3VuaWZvcm1zL3VuaWZvcm0tc2FtcGxlcnMtdGVzdC5o dG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3dlYmdsLzEuMC4yL3Jlc291cmNlcy93ZWJn bF90ZXN0X2ZpbGVzL2NvbmZvcm1hbmNlL3VuaWZvcm1zL3VuaWZvcm0tc2FtcGxlcnMtdGVzdC5o dG1sCShyZXZpc2lvbiAxNjE2NzApCisrKyBMYXlvdXRUZXN0cy93ZWJnbC8xLjAuMi9yZXNvdXJj ZXMvd2ViZ2xfdGVzdF9maWxlcy9jb25mb3JtYW5jZS91bmlmb3Jtcy91bmlmb3JtLXNhbXBsZXJz LXRlc3QuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtNTUsNiArNTUsNyBAQCBmdW5jdGlvbiBpbml0 KCkKICAgdmFyIHByb2dyYW0gPSB3dHUuc2V0dXBUZXh0dXJlZFF1YWQoZ2wpOwogCiAgIHZhciB0 ZXh0dXJlTG9jID0gZ2wuZ2V0VW5pZm9ybUxvY2F0aW9uKHByb2dyYW0sICJ0ZXgiKTsKKyAgdmFy IHRlc3RJbnQzMkFycmF5ID0gbmV3IEludDMyQXJyYXkoNCk7CiAKICAgZ2wudW5pZm9ybTFpKHRl eHR1cmVMb2MsIDEpOwogICBnbEVycm9yU2hvdWxkQmUoZ2wsIGdsLk5PX0VSUk9SLApAQCAtNjIs NiArNjMsOSBAQCBmdW5jdGlvbiBpbml0KCkKICAgZ2wudW5pZm9ybTFpdih0ZXh0dXJlTG9jLCBb MV0pOwogICBnbEVycm9yU2hvdWxkQmUoZ2wsIGdsLk5PX0VSUk9SLAogICAgICAgICAgICAgInVu aWZvcm0xaXYgY2FuIHNldCBhIHNhbXBsZXIgdW5pZm9ybSIpOworICBnbC51bmlmb3JtMWl2KHRl eHR1cmVMb2MsIHRlc3RJbnQzMkFycmF5KTsKKyAgZ2xFcnJvclNob3VsZEJlKGdsLCBnbC5OT19F UlJPUiwKKyAgICAgICAgICAgICJ1bmlmb3JtMWl2IGNhbiBzZXQgYSBzYW1wbGVyIHVuaWZvcm0i KTsKICAgZ2wudW5pZm9ybTFmKHRleHR1cmVMb2MsIDEpOwogICBnbEVycm9yU2hvdWxkQmUoZ2ws IGdsLklOVkFMSURfT1BFUkFUSU9OLAogICAgICAgICAgICAgInVuaWZvcm0xZiByZXR1cm5zIElO VkFMSURfT1BFUkFUSU9OIGlmIGF0dGVtcHRpbmcgdG8gc2V0IGEgc2FtcGxlciB1bmlmb3JtIik7 Cg== 220951 2014-01-11 19:36:15 -0800 2014-01-11 19:48:21 -0800 Patch bug-126775-20140111193614.patch text/plain 5613 bfulgham SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE2MTc5MykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE0LTAxLTExICBCcmVudCBGdWxnaGFtICA8 YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJHTF0gQ29ycmVjdCB1bmlmb3JtIGlu cHV0IHZhbGlkYXRpb24gZm9yIHRleHR1cmUgc2FtcGxlciB1bmlmb3JtcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2Nzc1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2NhbnZhcy93ZWJnbC91 bmlmb3JtLXNhbXBsZXJzLXRlc3QtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0 L2NhbnZhcy93ZWJnbC91bmlmb3JtLXNhbXBsZXJzLXRlc3QuaHRtbDogQ29ycmVjdGVkIHJlc291 cmNlCisgICAgICAgIGluY2x1ZGVzIHdoZW4gbW92aW5nIGZyb20ga2hyb25vcyBzdWl0ZSB0byBv dXIgZmFzdCBzdWl0ZS4KKyAgICAgICAgKiByZXNvdXJjZXMvanMtdGVzdC1wcmUuanM6CisgICAg ICAgIChleHBlY3RUcnVlKTogQWRkZWQuCisKIDIwMTQtMDEtMTEgIERlYW4gSmFja3NvbiAgPGRp bm9AYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIFJldmlzZSB0eXBlZCBhcnJheSBpbXBsZW1l bnRhdGlvbnMgdG8gbWF0Y2ggRUNNQVNjcmlwdCBhbmQgV2ViR0wgU3BlY2lmaWNhdGlvbgpJbmRl eDogTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvdW5pZm9ybS1zYW1wbGVycy10ZXN0LWV4 cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC91 bmlmb3JtLXNhbXBsZXJzLXRlc3QtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0 VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvdW5pZm9ybS1zYW1wbGVycy10ZXN0LWV4cGVjdGVkLnR4 dAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDE3IEBACitUZXN0cyB0aGF0IG9ubHkgVW5pZm9y bTFpIGFuZCBVbmlmb3JtMWl2IGNhbiBiZSB1c2VkIHRvIHNldHNhbXBsZXIgdW5pZm9ybXMuCisK K09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZv bGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworUEFTUyBnZXRFcnJvciB3YXMgZXhwZWN0ZWQg dmFsdWU6IE5PX0VSUk9SIDogdW5pZm9ybTFpIGNhbiBzZXQgYSBzYW1wbGVyIHVuaWZvcm0KK1BB U1MgZ2V0RXJyb3Igd2FzIGV4cGVjdGVkIHZhbHVlOiBOT19FUlJPUiA6IHVuaWZvcm0xaXYgY2Fu IHNldCBhIHNhbXBsZXIgdW5pZm9ybQorUEFTUyBnZXRFcnJvciB3YXMgZXhwZWN0ZWQgdmFsdWU6 IE5PX0VSUk9SIDogdW5pZm9ybTFpdiBjYW4gc2V0IGEgc2FtcGxlciB1bmlmb3JtCitQQVNTIGdl dEVycm9yIHdhcyBleHBlY3RlZCB2YWx1ZTogSU5WQUxJRF9PUEVSQVRJT04gOiB1bmlmb3JtMWYg cmV0dXJucyBJTlZBTElEX09QRVJBVElPTiBpZiBhdHRlbXB0aW5nIHRvIHNldCBhIHNhbXBsZXIg dW5pZm9ybQorUEFTUyBnZXRFcnJvciB3YXMgZXhwZWN0ZWQgdmFsdWU6IElOVkFMSURfT1BFUkFU SU9OIDogdW5pZm9ybTFmdiByZXR1cm5zIElOVkFMSURfT1BFUkFUSU9OIGlmIGF0dGVtcHRpbmcg dG8gc2V0IGEgc2FtcGxlciB1bmlmb3JtCitQQVNTIHVuaWZvcm0xaSB3b3JrcyBmb3IgYW55IHZh bGlkIHRleHR1cmUgdW5pdAorUEFTUyB1bmlmb3JtMWl2IHdvcmtzIGZvciBhbnkgdmFsaWQgdGV4 dHVyZSB1bml0CitQQVNTIHVuaWZvcm0xaSBnZW5lcmF0ZXMgSU5WQUxJRF9WQUxVRSBmb3IgaW52 YWxpZCB0ZXh0dXJlIHVuaXRzCitQQVNTIHVuaWZvcm0xaXYgZ2VuZXJhdGVzIElOVkFMSURfVkFM VUUgZm9yIGludmFsaWQgdGV4dHVyZSB1bml0cworUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMg dHJ1ZQorCitURVNUIENPTVBMRVRFCisKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dl YmdsL3VuaWZvcm0tc2FtcGxlcnMtdGVzdC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L2Zhc3QvY2FudmFzL3dlYmdsL3VuaWZvcm0tc2FtcGxlcnMtdGVzdC5odG1sCShyZXZpc2lvbiAx NjE3ODgpCisrKyBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC91bmlmb3JtLXNhbXBsZXJz LXRlc3QuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMSwzOSArMSwxMCBAQAotPCEtLQotCi0vKgot KiogQ29weXJpZ2h0IChjKSAyMDEyIFRoZSBLaHJvbm9zIEdyb3VwIEluYy4KLSoqCi0qKiBQZXJt aXNzaW9uIGlzIGhlcmVieSBncmFudGVkLCBmcmVlIG9mIGNoYXJnZSwgdG8gYW55IHBlcnNvbiBv YnRhaW5pbmcgYQotKiogY29weSBvZiB0aGlzIHNvZnR3YXJlIGFuZC9vciBhc3NvY2lhdGVkIGRv Y3VtZW50YXRpb24gZmlsZXMgKHRoZQotKiogIk1hdGVyaWFscyIpLCB0byBkZWFsIGluIHRoZSBN YXRlcmlhbHMgd2l0aG91dCByZXN0cmljdGlvbiwgaW5jbHVkaW5nCi0qKiB3aXRob3V0IGxpbWl0 YXRpb24gdGhlIHJpZ2h0cyB0byB1c2UsIGNvcHksIG1vZGlmeSwgbWVyZ2UsIHB1Ymxpc2gsCi0q KiBkaXN0cmlidXRlLCBzdWJsaWNlbnNlLCBhbmQvb3Igc2VsbCBjb3BpZXMgb2YgdGhlIE1hdGVy aWFscywgYW5kIHRvCi0qKiBwZXJtaXQgcGVyc29ucyB0byB3aG9tIHRoZSBNYXRlcmlhbHMgYXJl IGZ1cm5pc2hlZCB0byBkbyBzbywgc3ViamVjdCB0bwotKiogdGhlIGZvbGxvd2luZyBjb25kaXRp b25zOgotKioKLSoqIFRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlIGFuZCB0aGlzIHBlcm1pc3Np b24gbm90aWNlIHNoYWxsIGJlIGluY2x1ZGVkCi0qKiBpbiBhbGwgY29waWVzIG9yIHN1YnN0YW50 aWFsIHBvcnRpb25zIG9mIHRoZSBNYXRlcmlhbHMuCi0qKgotKiogVEhFIE1BVEVSSUFMUyBBUkUg UFJPVklERUQgIkFTIElTIiwgV0lUSE9VVCBXQVJSQU5UWSBPRiBBTlkgS0lORCwKLSoqIEVYUFJF U1MgT1IgSU1QTElFRCwgSU5DTFVESU5HIEJVVCBOT1QgTElNSVRFRCBUTyBUSEUgV0FSUkFOVElF UyBPRgotKiogTUVSQ0hBTlRBQklMSVRZLCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9T RSBBTkQgTk9OSU5GUklOR0VNRU5ULgotKiogSU4gTk8gRVZFTlQgU0hBTEwgVEhFIEFVVEhPUlMg T1IgQ09QWVJJR0hUIEhPTERFUlMgQkUgTElBQkxFIEZPUiBBTlkKLSoqIENMQUlNLCBEQU1BR0VT IE9SIE9USEVSIExJQUJJTElUWSwgV0hFVEhFUiBJTiBBTiBBQ1RJT04gT0YgQ09OVFJBQ1QsCi0q KiBUT1JUIE9SIE9USEVSV0lTRSwgQVJJU0lORyBGUk9NLCBPVVQgT0YgT1IgSU4gQ09OTkVDVElP TiBXSVRIIFRIRQotKiogTUFURVJJQUxTIE9SIFRIRSBVU0UgT1IgT1RIRVIgREVBTElOR1MgSU4g VEhFIE1BVEVSSUFMUy4KLSovCi0KLS0tPgotCi08IURPQ1RZUEUgaHRtbD4KIDxodG1sPgogICA8 aGVhZD4KIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KICAgICA8dGl0bGU+V2ViR0wgc2FtcGxlciB1 bmlmb3JtcyBjb25mb3JtYW5jZSB0ZXN0LjwvdGl0bGU+Ci0gICAgPGxpbmsgcmVsPSJzdHlsZXNo ZWV0IiBocmVmPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiLz4KLSAgICA8c2Ny aXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KLSAgICA8 c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL3dlYmdsLXRlc3QuanMiPiA8L3NjcmlwdD4KLSAgICA8 c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL3dlYmdsLXRlc3QtdXRpbHMuanMiPjwvc2NyaXB0Pgor ICAgIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2Ny aXB0PgorICAgIDxzY3JpcHQgc3JjPSJyZXNvdXJjZXMvd2ViZ2wtdGVzdC5qcyI+IDwvc2NyaXB0 PgorICAgIDxzY3JpcHQgc3JjPSJyZXNvdXJjZXMvd2ViZ2wtdGVzdC11dGlscy5qcyI+PC9zY3Jp cHQ+CiA8L2hlYWQ+CiA8Ym9keT4KIDxjYW52YXMgaWQ9ImV4YW1wbGUiIHdpZHRoPSIyIiBoZWln aHQ9IjIiIHN0eWxlPSJ3aWR0aDogNDBweDsgaGVpZ2h0OiA0MHB4OyI+PC9jYW52YXM+CkBAIC00 OCw2ICsxOSw5IEBAIGZ1bmN0aW9uIGluaXQoKQogICAgICAgIlRlc3RzIHRoYXQgb25seSBVbmlm b3JtMWkgYW5kIFVuaWZvcm0xaXYgY2FuIGJlIHVzZWQgdG8gc2V0IiArCiAgICAgICAic2FtcGxl ciB1bmlmb3Jtcy4iKTsKIAorIGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgIHdpbmRvdy5pbnRl cm5hbHMuc2V0dGluZ3Muc2V0V2ViR0xFcnJvcnNUb0NvbnNvbGVFbmFibGVkKGZhbHNlKTsKKwog ICB2YXIgY2FudmFzMmQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY2FudmFzMmQiKTsKIAog ICB2YXIgd3R1ID0gV2ViR0xUZXN0VXRpbHM7CkBAIC01NSw3ICsyOSw3IEBAIGZ1bmN0aW9uIGlu aXQoKQogICB2YXIgcHJvZ3JhbSA9IHd0dS5zZXR1cFRleHR1cmVkUXVhZChnbCk7CiAKICAgdmFy IHRleHR1cmVMb2MgPSBnbC5nZXRVbmlmb3JtTG9jYXRpb24ocHJvZ3JhbSwgInRleCIpOwotICB2 YXIgdGVzdEludDMyQXJyYXkgPSBuZXcgSW50MzJBcnJheSg0KTsKKyAgdmFyIHRlc3RJbnQzMkFy cmF5ID0gbmV3IEludDMyQXJyYXkoMSk7CiAKICAgZ2wudW5pZm9ybTFpKHRleHR1cmVMb2MsIDEp OwogICBnbEVycm9yU2hvdWxkQmUoZ2wsIGdsLk5PX0VSUk9SLApAQCAtMTA4LDcgKzgyLDcgQEAg ZnVuY3Rpb24gaW5pdCgpCiBpbml0KCk7CiB2YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsK IDwvc2NyaXB0PgotPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMi Pjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3Qu anMiPjwvc2NyaXB0PgogPC9ib2R5PgogPC9odG1sPgogCkluZGV4OiBMYXlvdXRUZXN0cy9yZXNv dXJjZXMvanMtdGVzdC1wcmUuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcmVzb3VyY2Vz L2pzLXRlc3QtcHJlLmpzCShyZXZpc2lvbiAxNjE3ODgpCisrKyBMYXlvdXRUZXN0cy9yZXNvdXJj ZXMvanMtdGVzdC1wcmUuanMJKHdvcmtpbmcgY29weSkKQEAgLTU2NCw2ICs1NjQsMTQgQEAgZnVu Y3Rpb24gc2hvdWxkQmVHcmVhdGVyVGhhbk9yRXF1YWwoX2EsIAogICAgICAgICB0ZXN0UGFzc2Vk KF9hICsgIiBpcyA+PSAiICsgX2IpOwogfQogCitmdW5jdGlvbiBleHBlY3RUcnVlKHYsIG1zZykg eworICBpZiAodikgeworICAgIHRlc3RQYXNzZWQobXNnKTsKKyAgfSBlbHNlIHsKKyAgICB0ZXN0 RmFpbGVkKG1zZyk7CisgIH0KK30KKwogZnVuY3Rpb24gc2hvdWxkTm90VGhyb3coX2EpIHsKICAg ICB0cnkgewogICAgICAgICBldmFsKF9hKTsK