215036 2020-07-31 15:14:42 -0700 [WebGL2] Upgrade vertexAttribPointer with new supported types 2020-08-05 18:59:18 -0700 1 1 1 Unclassified WebKit WebGL WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 126938 214211 126404 1 kbr jdarpinian cdumez changseok dino esprehn+autocc ews-watchlist graouts gyuyoung.kim kondapallykalyan webkit-bug-importer oldest_to_newest 1676993 0 kbr 2020-07-31 15:14:42 -0700 Based on some feedback from the Filament team, and examining WebGLRenderingContextBase::vertexAttribPointer (which isn't overridden in WebGL2RenderingContext), it looks like vertexAttribPointer needs to be upgraded to support the new types in WebGL 2.0 / OpenGL ES 3.0. 1677009 1 kbr 2020-07-31 15:30:00 -0700 When this is fixed, let's make sure to test with the Filament team's test case to see whether it's working. 1677498 2 405886 jdarpinian 2020-08-03 16:55:06 -0700 Created attachment 405886 Patch 1677499 3 jdarpinian 2020-08-03 16:57:19 -0700 This doesn't appear to be tested at all by the conformance tests as far as I can tell. I'm working on adding some tests. 1677524 4 405894 jdarpinian 2020-08-03 17:28:48 -0700 Created attachment 405894 Patch 1677533 5 jdarpinian 2020-08-03 17:37:32 -0700 Confirmed that this fixes the Filament test case :) 1677698 6 405894 kbr 2020-08-04 12:42:37 -0700 Comment on attachment 405894 Patch Looks good! 1677701 7 405894 dino 2020-08-04 12:50:18 -0700 Comment on attachment 405894 Patch Can we get a test (or WebGL conformance test) for this? 1677702 8 405894 dino 2020-08-04 12:50:48 -0700 Comment on attachment 405894 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405894&action=review > Source/WebCore/ChangeLog:6 > + Reviewed by NOBODY (OOPS!). Please note here that a test is coming in the WebGL suite. 1678156 9 406062 jdarpinian 2020-08-05 17:44:43 -0700 Created attachment 406062 add tests 1678157 10 406062 jdarpinian 2020-08-05 17:45:38 -0700 Comment on attachment 406062 add tests I went ahead and updated the conformance tests. 1678173 11 406062 kbr 2020-08-05 18:41:06 -0700 Comment on attachment 406062 add tests Looks good - thanks for patching up the conformance tests James! 1678177 12 ews-feeder 2020-08-05 18:58:14 -0700 Committed r265317: <https://trac.webkit.org/changeset/265317> All reviewed patches have been landed. Closing bug and clearing flags on attachment 406062. 1678178 13 webkit-bug-importer 2020-08-05 18:59:18 -0700 <rdar://problem/66604955> 405886 2020-08-03 16:55:06 -0700 2020-08-03 17:28:46 -0700 Patch bug-215036-20200803165505.patch text/plain 2721 jdarpinian U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGY1NzJjYjI4Yjg4MDFj ODViNzk2MDU2MmFhZTZjOGMwY2Q4NDhiYy4uOTZjZjM3ZmM1YjhhYTMzNzNlYzE1NTBlYzRkYzRm MDBhY2E5OWVmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA4LTAzICBKYW1l cyBEYXJwaW5pYW4gIDxqZGFycGluaWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbV2ViR0wy XSBVcGdyYWRlIHZlcnRleEF0dHJpYlBvaW50ZXIgd2l0aCBuZXcgc3VwcG9ydGVkIHR5cGVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUwMzYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0bWwvY2Fu dmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2Vi R0xSZW5kZXJpbmdDb250ZXh0QmFzZTo6c2l6ZUluQnl0ZXMpOgorICAgICAgICAoV2ViQ29yZTo6 V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZTo6dmVydGV4QXR0cmliUG9pbnRlcik6CisKIDIwMjAt MDctMzAgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAg V2ViIGNvbnRlbnQgZ2V0cyBzdHVjayBpbiBhbiBpbmFjdGl2ZSBzdGF0ZSAobm8gY3Vyc29yIHVw ZGF0ZXMgb3IgdGV4dCBpbnNlcnRpb24gY2FyZXQpIHdoZW4gYWN0aXZhdGluZyBhIHRhYiB3aXRo IGEgdGh1bWJuYWlsIHZpc2libGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2Fu dmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9j YW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5jcHAKaW5kZXggODA4MjMyMTUxOWFjNjc0 ZWM1MmQwZWU0M2Q4NDc3NDFjZWE2NTA3NS4uZmM4NWE2N2M4NzkyZTcxNGEwOGU5YzI2ODRhOTRk ODUzMjkzNjYzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xS ZW5kZXJpbmdDb250ZXh0QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMv V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5jcHAKQEAgLTEyOTUsNiArMTI5NSwxMiBAQCB1bnNp Z25lZCBXZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlOjpzaXplSW5CeXRlcyhHQ0dMZW51bSB0eXBl KQogICAgICAgICByZXR1cm4gc2l6ZW9mKEdDR0x1aW50KTsKICAgICBjYXNlIEdyYXBoaWNzQ29u dGV4dEdMOjpGTE9BVDoKICAgICAgICAgcmV0dXJuIHNpemVvZihHQ0dMZmxvYXQpOworICAgIGNh c2UgR3JhcGhpY3NDb250ZXh0R0w6OkhBTEZfRkxPQVQ6CisgICAgICAgIHJldHVybiAyOworICAg IGNhc2UgR3JhcGhpY3NDb250ZXh0R0w6OklOVF8yXzEwXzEwXzEwX1JFVjoKKyAgICAgICAgcmV0 dXJuIDQ7CisgICAgY2FzZSBHcmFwaGljc0NvbnRleHRHTDo6VU5TSUdORURfSU5UXzJfMTBfMTBf MTBfUkVWOgorICAgICAgICByZXR1cm4gNDsKICAgICB9CiAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CiAgICAgcmV0dXJuIDA7CkBAIC01OTY5LDggKzU5NzUsMjEgQEAgdm9pZCBXZWJHTFJlbmRl cmluZ0NvbnRleHRCYXNlOjp2ZXJ0ZXhBdHRyaWJQb2ludGVyKEdDR0x1aW50IGluZGV4LCBHQ0dM aW50IHNpemUKICAgICBjYXNlIEdyYXBoaWNzQ29udGV4dEdMOjpGTE9BVDoKICAgICAgICAgYnJl YWs7CiAgICAgZGVmYXVsdDoKLSAgICAgICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250 ZXh0R0w6OklOVkFMSURfRU5VTSwgInZlcnRleEF0dHJpYlBvaW50ZXIiLCAiaW52YWxpZCB0eXBl Iik7Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgaWYgKCFpc1dlYkdMMigpKSB7CisgICAgICAg ICAgICBzeW50aGVzaXplR0xFcnJvcihHcmFwaGljc0NvbnRleHRHTDo6SU5WQUxJRF9FTlVNLCAi dmVydGV4QXR0cmliUG9pbnRlciIsICJpbnZhbGlkIHR5cGUiKTsKKyAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgfQorICAgICAgICBzd2l0Y2ggKHR5cGUpIHsKKyAgICAgICAgY2FzZSBHcmFw aGljc0NvbnRleHRHTDo6SU5UOgorICAgICAgICBjYXNlIEdyYXBoaWNzQ29udGV4dEdMOjpVTlNJ R05FRF9JTlQ6CisgICAgICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0R0w6OkhBTEZfRkxPQVQ6Cisg ICAgICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0R0w6OklOVF8yXzEwXzEwXzEwX1JFVjoKKyAgICAg ICAgY2FzZSBHcmFwaGljc0NvbnRleHRHTDo6VU5TSUdORURfSU5UXzJfMTBfMTBfMTBfUkVWOgor ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBzeW50aGVz aXplR0xFcnJvcihHcmFwaGljc0NvbnRleHRHTDo6SU5WQUxJRF9FTlVNLCAidmVydGV4QXR0cmli UG9pbnRlciIsICJpbnZhbGlkIHR5cGUiKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg fQogICAgIH0KICAgICBpZiAoaW5kZXggPj0gbV9tYXhWZXJ0ZXhBdHRyaWJzKSB7CiAgICAgICAg IHN5bnRoZXNpemVHTEVycm9yKEdyYXBoaWNzQ29udGV4dEdMOjpJTlZBTElEX1ZBTFVFLCAidmVy dGV4QXR0cmliUG9pbnRlciIsICJpbmRleCBvdXQgb2YgcmFuZ2UiKTsK 405894 2020-08-03 17:28:48 -0700 2020-08-05 17:44:42 -0700 Patch bug-215036-20200803172847.patch text/plain 2938 jdarpinian U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGY1NzJjYjI4Yjg4MDFj ODViNzk2MDU2MmFhZTZjOGMwY2Q4NDhiYy4uOTZjZjM3ZmM1YjhhYTMzNzNlYzE1NTBlYzRkYzRm MDBhY2E5OWVmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA4LTAzICBKYW1l cyBEYXJwaW5pYW4gIDxqZGFycGluaWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbV2ViR0wy XSBVcGdyYWRlIHZlcnRleEF0dHJpYlBvaW50ZXIgd2l0aCBuZXcgc3VwcG9ydGVkIHR5cGVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUwMzYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0bWwvY2Fu dmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2Vi R0xSZW5kZXJpbmdDb250ZXh0QmFzZTo6c2l6ZUluQnl0ZXMpOgorICAgICAgICAoV2ViQ29yZTo6 V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZTo6dmVydGV4QXR0cmliUG9pbnRlcik6CisKIDIwMjAt MDctMzAgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAg V2ViIGNvbnRlbnQgZ2V0cyBzdHVjayBpbiBhbiBpbmFjdGl2ZSBzdGF0ZSAobm8gY3Vyc29yIHVw ZGF0ZXMgb3IgdGV4dCBpbnNlcnRpb24gY2FyZXQpIHdoZW4gYWN0aXZhdGluZyBhIHRhYiB3aXRo IGEgdGh1bWJuYWlsIHZpc2libGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2Fu dmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9j YW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5jcHAKaW5kZXggODA4MjMyMTUxOWFjNjc0 ZWM1MmQwZWU0M2Q4NDc3NDFjZWE2NTA3NS4uOWNlODYyMDhiMDZhNjUyYjk5MDUyN2QyYzE4OGU5 YWExM2MyOWVjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xS ZW5kZXJpbmdDb250ZXh0QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMv V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5jcHAKQEAgLTEyOTUsNiArMTI5NSwxMSBAQCB1bnNp Z25lZCBXZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlOjpzaXplSW5CeXRlcyhHQ0dMZW51bSB0eXBl KQogICAgICAgICByZXR1cm4gc2l6ZW9mKEdDR0x1aW50KTsKICAgICBjYXNlIEdyYXBoaWNzQ29u dGV4dEdMOjpGTE9BVDoKICAgICAgICAgcmV0dXJuIHNpemVvZihHQ0dMZmxvYXQpOworICAgIGNh c2UgR3JhcGhpY3NDb250ZXh0R0w6OkhBTEZfRkxPQVQ6CisgICAgICAgIHJldHVybiAyOworICAg IGNhc2UgR3JhcGhpY3NDb250ZXh0R0w6OklOVF8yXzEwXzEwXzEwX1JFVjoKKyAgICBjYXNlIEdy YXBoaWNzQ29udGV4dEdMOjpVTlNJR05FRF9JTlRfMl8xMF8xMF8xMF9SRVY6CisgICAgICAgIHJl dHVybiA0OwogICAgIH0KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4gMDsK QEAgLTU5NjksOCArNTk3NCwyNiBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2U6OnZl cnRleEF0dHJpYlBvaW50ZXIoR0NHTHVpbnQgaW5kZXgsIEdDR0xpbnQgc2l6ZQogICAgIGNhc2Ug R3JhcGhpY3NDb250ZXh0R0w6OkZMT0FUOgogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0Ogot ICAgICAgICBzeW50aGVzaXplR0xFcnJvcihHcmFwaGljc0NvbnRleHRHTDo6SU5WQUxJRF9FTlVN LCAidmVydGV4QXR0cmliUG9pbnRlciIsICJpbnZhbGlkIHR5cGUiKTsKLSAgICAgICAgcmV0dXJu OworICAgICAgICBpZiAoIWlzV2ViR0wyKCkpIHsKKyAgICAgICAgICAgIHN5bnRoZXNpemVHTEVy cm9yKEdyYXBoaWNzQ29udGV4dEdMOjpJTlZBTElEX0VOVU0sICJ2ZXJ0ZXhBdHRyaWJQb2ludGVy IiwgImludmFsaWQgdHlwZSIpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAg ICAgIHN3aXRjaCAodHlwZSkgeworICAgICAgICBjYXNlIEdyYXBoaWNzQ29udGV4dEdMOjpJTlQ6 CisgICAgICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0R0w6OlVOU0lHTkVEX0lOVDoKKyAgICAgICAg Y2FzZSBHcmFwaGljc0NvbnRleHRHTDo6SEFMRl9GTE9BVDoKKyAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICBjYXNlIEdyYXBoaWNzQ29udGV4dEdMOjpJTlRfMl8xMF8xMF8xMF9SRVY6CisgICAg ICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0R0w6OlVOU0lHTkVEX0lOVF8yXzEwXzEwXzEwX1JFVjoK KyAgICAgICAgICAgIGlmIChzaXplICE9IDQpIHsKKyAgICAgICAgICAgICAgICBzeW50aGVzaXpl R0xFcnJvcihHcmFwaGljc0NvbnRleHRHTDo6SU5WQUxJRF9PUEVSQVRJT04sICJ2ZXJ0ZXhBdHRy aWJQb2ludGVyIiwgIltVTlNJR05FRF9dSU5UXzJfMTBfMTBfMTBfUkVWIHJlcXVpcmVzIHNpemUg NCIpOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAg IGJyZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgc3ludGhlc2l6ZUdMRXJyb3Io R3JhcGhpY3NDb250ZXh0R0w6OklOVkFMSURfRU5VTSwgInZlcnRleEF0dHJpYlBvaW50ZXIiLCAi aW52YWxpZCB0eXBlIik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KICAgICB9CiAg ICAgaWYgKGluZGV4ID49IG1fbWF4VmVydGV4QXR0cmlicykgewogICAgICAgICBzeW50aGVzaXpl R0xFcnJvcihHcmFwaGljc0NvbnRleHRHTDo6SU5WQUxJRF9WQUxVRSwgInZlcnRleEF0dHJpYlBv aW50ZXIiLCAiaW5kZXggb3V0IG9mIHJhbmdlIik7Cg== 406062 2020-08-05 17:44:43 -0700 2020-08-05 18:58:15 -0700 add tests bug-215036-20200805174443.patch text/plain 12304 jdarpinian U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGY1NzJjYjI4Yjg4MDFj ODViNzk2MDU2MmFhZTZjOGMwY2Q4NDhiYy4uMTdjNTRmY2RhZjgwMzNmYTBiNGM2OWNiY2JjNDEw MGIwNDM0ZDQzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA4LTAzICBKYW1l cyBEYXJwaW5pYW4gIDxqZGFycGluaWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbV2ViR0wy XSBVcGdyYWRlIHZlcnRleEF0dHJpYlBvaW50ZXIgd2l0aCBuZXcgc3VwcG9ydGVkIHR5cGVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUwMzYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0ZWQgYnkg dXBkYXRlZCBXZWJHTCBjb25mb3JtYW5jZSB0ZXN0cyB3ZWJnbC8yLjAuMC9jb25mb3JtYW5jZS9h dHRyaWJzL2dsLXZlcnRleGF0dHJpYnBvaW50ZXItb2Zmc2V0cy5odG1sIGFuZCB3ZWJnbC8yLjAu MC9jb25mb3JtYW5jZS9hdHRyaWJzL2dsLXZlcnRleGF0dHJpYnBvaW50ZXIuaHRtbAorCisgICAg ICAgICogaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlOjpzaXplSW5CeXRlcyk6CisgICAg ICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlOjp2ZXJ0ZXhBdHRyaWJQb2lu dGVyKToKKwogMjAyMC0wNy0zMCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNv bT4KIAogICAgICAgICBXZWIgY29udGVudCBnZXRzIHN0dWNrIGluIGFuIGluYWN0aXZlIHN0YXRl IChubyBjdXJzb3IgdXBkYXRlcyBvciB0ZXh0IGluc2VydGlvbiBjYXJldCkgd2hlbiBhY3RpdmF0 aW5nIGEgdGFiIHdpdGggYSB0aHVtYm5haWwgdmlzaWJsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlLmNwcAppbmRleCA4 MDgyMzIxNTE5YWM2NzRlYzUyZDBlZTQzZDg0Nzc0MWNlYTY1MDc1Li45Y2U4NjIwOGIwNmE2NTJi OTkwNTI3ZDJjMTg4ZTlhYTEzYzI5ZWM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlLmNwcApAQCAtMTI5NSw2ICsx Mjk1LDExIEBAIHVuc2lnbmVkIFdlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2U6OnNpemVJbkJ5dGVz KEdDR0xlbnVtIHR5cGUpCiAgICAgICAgIHJldHVybiBzaXplb2YoR0NHTHVpbnQpOwogICAgIGNh c2UgR3JhcGhpY3NDb250ZXh0R0w6OkZMT0FUOgogICAgICAgICByZXR1cm4gc2l6ZW9mKEdDR0xm bG9hdCk7CisgICAgY2FzZSBHcmFwaGljc0NvbnRleHRHTDo6SEFMRl9GTE9BVDoKKyAgICAgICAg cmV0dXJuIDI7CisgICAgY2FzZSBHcmFwaGljc0NvbnRleHRHTDo6SU5UXzJfMTBfMTBfMTBfUkVW OgorICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0R0w6OlVOU0lHTkVEX0lOVF8yXzEwXzEwXzEwX1JF VjoKKyAgICAgICAgcmV0dXJuIDQ7CiAgICAgfQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwog ICAgIHJldHVybiAwOwpAQCAtNTk2OSw4ICs1OTc0LDI2IEBAIHZvaWQgV2ViR0xSZW5kZXJpbmdD b250ZXh0QmFzZTo6dmVydGV4QXR0cmliUG9pbnRlcihHQ0dMdWludCBpbmRleCwgR0NHTGludCBz aXplCiAgICAgY2FzZSBHcmFwaGljc0NvbnRleHRHTDo6RkxPQVQ6CiAgICAgICAgIGJyZWFrOwog ICAgIGRlZmF1bHQ6Ci0gICAgICAgIHN5bnRoZXNpemVHTEVycm9yKEdyYXBoaWNzQ29udGV4dEdM OjpJTlZBTElEX0VOVU0sICJ2ZXJ0ZXhBdHRyaWJQb2ludGVyIiwgImludmFsaWQgdHlwZSIpOwot ICAgICAgICByZXR1cm47CisgICAgICAgIGlmICghaXNXZWJHTDIoKSkgeworICAgICAgICAgICAg c3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0R0w6OklOVkFMSURfRU5VTSwgInZlcnRl eEF0dHJpYlBvaW50ZXIiLCAiaW52YWxpZCB0eXBlIik7CisgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIH0KKyAgICAgICAgc3dpdGNoICh0eXBlKSB7CisgICAgICAgIGNhc2UgR3JhcGhpY3ND b250ZXh0R0w6OklOVDoKKyAgICAgICAgY2FzZSBHcmFwaGljc0NvbnRleHRHTDo6VU5TSUdORURf SU5UOgorICAgICAgICBjYXNlIEdyYXBoaWNzQ29udGV4dEdMOjpIQUxGX0ZMT0FUOgorICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0R0w6OklOVF8yXzEwXzEw XzEwX1JFVjoKKyAgICAgICAgY2FzZSBHcmFwaGljc0NvbnRleHRHTDo6VU5TSUdORURfSU5UXzJf MTBfMTBfMTBfUkVWOgorICAgICAgICAgICAgaWYgKHNpemUgIT0gNCkgeworICAgICAgICAgICAg ICAgIHN5bnRoZXNpemVHTEVycm9yKEdyYXBoaWNzQ29udGV4dEdMOjpJTlZBTElEX09QRVJBVElP TiwgInZlcnRleEF0dHJpYlBvaW50ZXIiLCAiW1VOU0lHTkVEX11JTlRfMl8xMF8xMF8xMF9SRVYg cmVxdWlyZXMgc2l6ZSA0Iik7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAg fQorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBzeW50 aGVzaXplR0xFcnJvcihHcmFwaGljc0NvbnRleHRHTDo6SU5WQUxJRF9FTlVNLCAidmVydGV4QXR0 cmliUG9pbnRlciIsICJpbnZhbGlkIHR5cGUiKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQogICAgIH0KICAgICBpZiAoaW5kZXggPj0gbV9tYXhWZXJ0ZXhBdHRyaWJzKSB7CiAgICAg ICAgIHN5bnRoZXNpemVHTEVycm9yKEdyYXBoaWNzQ29udGV4dEdMOjpJTlZBTElEX1ZBTFVFLCAi dmVydGV4QXR0cmliUG9pbnRlciIsICJpbmRleCBvdXQgb2YgcmFuZ2UiKTsKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL3dlYmdsLzIuMC4wL3Jlc291cmNlcy93ZWJnbF90ZXN0X2ZpbGVzL2NvbmZv cm1hbmNlL2F0dHJpYnMvZ2wtdmVydGV4YXR0cmlicG9pbnRlci1vZmZzZXRzLmh0bWwgYi9MYXlv dXRUZXN0cy93ZWJnbC8yLjAuMC9yZXNvdXJjZXMvd2ViZ2xfdGVzdF9maWxlcy9jb25mb3JtYW5j ZS9hdHRyaWJzL2dsLXZlcnRleGF0dHJpYnBvaW50ZXItb2Zmc2V0cy5odG1sCmluZGV4IDFlNTM3 YmJiNWQyYjI3ZjM1YmYwZTNmMGRhYWY4Y2M5N2EzYWU3ZDcuLjNjYjhiZDg0YTY1NjkyNzU0OTlk M2U0M2IzZWVmZWZmZmNjMzU3MGMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3dlYmdsLzIuMC4w L3Jlc291cmNlcy93ZWJnbF90ZXN0X2ZpbGVzL2NvbmZvcm1hbmNlL2F0dHJpYnMvZ2wtdmVydGV4 YXR0cmlicG9pbnRlci1vZmZzZXRzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvd2ViZ2wvMi4wLjAv cmVzb3VyY2VzL3dlYmdsX3Rlc3RfZmlsZXMvY29uZm9ybWFuY2UvYXR0cmlicy9nbC12ZXJ0ZXhh dHRyaWJwb2ludGVyLW9mZnNldHMuaHRtbApAQCAtMSwyOCArMSw3IEBACiA8IS0tCi0KLS8qCi0q KiBDb3B5cmlnaHQgKGMpIDIwMTIgVGhlIEtocm9ub3MgR3JvdXAgSW5jLgotKioKLSoqIFBlcm1p c3Npb24gaXMgaGVyZWJ5IGdyYW50ZWQsIGZyZWUgb2YgY2hhcmdlLCB0byBhbnkgcGVyc29uIG9i dGFpbmluZyBhCi0qKiBjb3B5IG9mIHRoaXMgc29mdHdhcmUgYW5kL29yIGFzc29jaWF0ZWQgZG9j dW1lbnRhdGlvbiBmaWxlcyAodGhlCi0qKiAiTWF0ZXJpYWxzIiksIHRvIGRlYWwgaW4gdGhlIE1h dGVyaWFscyB3aXRob3V0IHJlc3RyaWN0aW9uLCBpbmNsdWRpbmcKLSoqIHdpdGhvdXQgbGltaXRh dGlvbiB0aGUgcmlnaHRzIHRvIHVzZSwgY29weSwgbW9kaWZ5LCBtZXJnZSwgcHVibGlzaCwKLSoq IGRpc3RyaWJ1dGUsIHN1YmxpY2Vuc2UsIGFuZC9vciBzZWxsIGNvcGllcyBvZiB0aGUgTWF0ZXJp YWxzLCBhbmQgdG8KLSoqIHBlcm1pdCBwZXJzb25zIHRvIHdob20gdGhlIE1hdGVyaWFscyBhcmUg ZnVybmlzaGVkIHRvIGRvIHNvLCBzdWJqZWN0IHRvCi0qKiB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnM6Ci0qKgotKiogVGhlIGFib3ZlIGNvcHlyaWdodCBub3RpY2UgYW5kIHRoaXMgcGVybWlzc2lv biBub3RpY2Ugc2hhbGwgYmUgaW5jbHVkZWQKLSoqIGluIGFsbCBjb3BpZXMgb3Igc3Vic3RhbnRp YWwgcG9ydGlvbnMgb2YgdGhlIE1hdGVyaWFscy4KLSoqCi0qKiBUSEUgTUFURVJJQUxTIEFSRSBQ Uk9WSURFRCAiQVMgSVMiLCBXSVRIT1VUIFdBUlJBTlRZIE9GIEFOWSBLSU5ELAotKiogRVhQUkVT UyBPUiBJTVBMSUVELCBJTkNMVURJTkcgQlVUIE5PVCBMSU1JVEVEIFRPIFRIRSBXQVJSQU5USUVT IE9GCi0qKiBNRVJDSEFOVEFCSUxJVFksIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NF IEFORCBOT05JTkZSSU5HRU1FTlQuCi0qKiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQVVUSE9SUyBP UiBDT1BZUklHSFQgSE9MREVSUyBCRSBMSUFCTEUgRk9SIEFOWQotKiogQ0xBSU0sIERBTUFHRVMg T1IgT1RIRVIgTElBQklMSVRZLCBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBDT05UUkFDVCwKLSoq IFRPUlQgT1IgT1RIRVJXSVNFLCBBUklTSU5HIEZST00sIE9VVCBPRiBPUiBJTiBDT05ORUNUSU9O IFdJVEggVEhFCi0qKiBNQVRFUklBTFMgT1IgVEhFIFVTRSBPUiBPVEhFUiBERUFMSU5HUyBJTiBU SEUgTUFURVJJQUxTLgotKi8KLQorQ29weXJpZ2h0IChjKSAyMDE5IFRoZSBLaHJvbm9zIEdyb3Vw IEluYy4KK1VzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHls ZSBsaWNlbnNlIHRoYXQgY2FuIGJlCitmb3VuZCBpbiB0aGUgTElDRU5TRS50eHQgZmlsZS4KIC0t PgogCiA8IURPQ1RZUEUgaHRtbD4KQEAgLTczLDEyICs1Miw3IEBAIFRoZXJlIGlzIHN1cHBvc2Vk IHRvIGJlIGFuIGV4YW1wbGUgZHJhd2luZyBoZXJlLCBidXQgaXQncyBub3QgaW1wb3J0YW50Lgog ICAgICAgICAgICAgICAgIGNvbXBvbmVudFNpemU6IDQsCiAgICAgICAgICAgICAgICAgbm9ybWFs aXplOiBmYWxzZSwKICAgICAgICAgICAgICAgfSwKLSAgICAgICAgICAgICAgeyBkYXRhOiBuZXcg RmxvYXQzMkFycmF5KFsgMCwgMSwgMCwgMSwgMCwgMCwgMCwgMCwgMCBdKSwKLSAgICAgICAgICAg ICAgICB0eXBlOiBnbC5GTE9BVCwKLSAgICAgICAgICAgICAgICBjb21wb25lbnRTaXplOiA0LAot ICAgICAgICAgICAgICAgIG5vcm1hbGl6ZTogZmFsc2UsCi0gICAgICAgICAgICAgIH0sCi0gICAg ICAgICAgICAgIHsgZGF0YTogbmV3IFVpbnQxNkFycmF5KFsgMCwgMzI3NjcsIDAsIDMyNzY3LCAw LCAwLCAwLCAwLCAwIF0pLAorICAgICAgICAgICAgICB7IGRhdGE6IG5ldyBVaW50MTZBcnJheShb IDAsIDMyNzY3LCAwLCAzMjc2NywgMCwgMCwgMCwgMCwgMF0pLAogICAgICAgICAgICAgICAgIHR5 cGU6IGdsLlNIT1JULAogICAgICAgICAgICAgICAgIGNvbXBvbmVudFNpemU6IDIsCiAgICAgICAg ICAgICAgICAgbm9ybWFsaXplOiB0cnVlLApAQCAtMTIwLDYgKzk0LDQxIEBAIFRoZXJlIGlzIHN1 cHBvc2VkIHRvIGJlIGFuIGV4YW1wbGUgZHJhd2luZyBoZXJlLCBidXQgaXQncyBub3QgaW1wb3J0 YW50LgogICAgICAgICAgICAgICB9CiAgICAgICAgICAgICBdOwogCisgICAgICAgICAgICBpZiAo d3R1LmdldERlZmF1bHQzRENvbnRleHRWZXJzaW9uKCkgPj0gMikgeworICAgICAgICAgICAgICB0 ZXN0cy5wdXNoKC4uLlsKKyAgICAgICAgICAgICAgICAgIHsgZGF0YTogbmV3IEludDMyQXJyYXko WyAwLCAxLCAwLCAxLCAwLCAwLCAwLCAwLCAwXSksCisgICAgICAgICAgICAgICAgICAgIHR5cGU6 IGdsLklOVCwKKyAgICAgICAgICAgICAgICAgICAgY29tcG9uZW50U2l6ZTogNCwKKyAgICAgICAg ICAgICAgICAgICAgbm9ybWFsaXplOiBmYWxzZSwKKyAgICAgICAgICAgICAgICAgIH0sCisgICAg ICAgICAgICAgICAgICB7IGRhdGE6IG5ldyBJbnQzMkFycmF5KFsgMCwgMjE0NzQ4MzY0NywgMCwg MjE0NzQ4MzY0NywgMCwgMCwgMCwgMCwgMF0pLAorICAgICAgICAgICAgICAgICAgICB0eXBlOiBn bC5JTlQsCisgICAgICAgICAgICAgICAgICAgIGNvbXBvbmVudFNpemU6IDQsCisgICAgICAgICAg ICAgICAgICAgIG5vcm1hbGl6ZTogdHJ1ZSwKKyAgICAgICAgICAgICAgICAgIH0sCisgICAgICAg ICAgICAgICAgICB7IGRhdGE6IG5ldyBVaW50MzJBcnJheShbIDAsIDEsIDAsIDEsIDAsIDAsIDAs IDAsIDBdKSwKKyAgICAgICAgICAgICAgICAgICAgdHlwZTogZ2wuVU5TSUdORURfSU5ULAorICAg ICAgICAgICAgICAgICAgICBjb21wb25lbnRTaXplOiA0LAorICAgICAgICAgICAgICAgICAgICBu b3JtYWxpemU6IGZhbHNlLAorICAgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICAg IHsgZGF0YTogbmV3IFVpbnQzMkFycmF5KFsgMCwgNDI5NDk2NzI5NSwgMCwgNDI5NDk2NzI5NSwg MCwgMCwgMCwgMCwgMF0pLAorICAgICAgICAgICAgICAgICAgICB0eXBlOiBnbC5VTlNJR05FRF9J TlQsCisgICAgICAgICAgICAgICAgICAgIGNvbXBvbmVudFNpemU6IDQsCisgICAgICAgICAgICAg ICAgICAgIG5vcm1hbGl6ZTogdHJ1ZSwKKyAgICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAg ICAgICAgICB7IGRhdGE6IG5ldyBVaW50MTZBcnJheShbIDAsIDBiMTExMTAwMDAwMDAwMDAsIDAs IDBiMTExMTAwMDAwMDAwMDAsIDAsIDAsIDAsIDAsIDBdKSwKKyAgICAgICAgICAgICAgICAgICAg dHlwZTogZ2wuSEFMRl9GTE9BVCwKKyAgICAgICAgICAgICAgICAgICAgY29tcG9uZW50U2l6ZTog MiwKKyAgICAgICAgICAgICAgICAgICAgbm9ybWFsaXplOiBmYWxzZSwKKyAgICAgICAgICAgICAg ICAgIH0sCisgICAgICAgICAgICAgICAgICB7IGRhdGE6IG5ldyBVaW50MTZBcnJheShbIDAsIDBi MTExMTAwMDAwMDAwMDAsIDAsIDBiMTExMTAwMDAwMDAwMDAsIDAsIDAsIDAsIDAsIDBdKSwKKyAg ICAgICAgICAgICAgICAgICAgdHlwZTogZ2wuSEFMRl9GTE9BVCwKKyAgICAgICAgICAgICAgICAg ICAgY29tcG9uZW50U2l6ZTogMiwKKyAgICAgICAgICAgICAgICAgICAgbm9ybWFsaXplOiBmYWxz ZSwKKyAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBdKTsKKyAgICAgICAgICAg IH0KKwogICAgICAgICAgICAgdmFyIHZlcnRleE9iamVjdCA9IGdsLmNyZWF0ZUJ1ZmZlcigpOwog ICAgICAgICAgICAgZ2wuYmluZEJ1ZmZlcihnbC5BUlJBWV9CVUZGRVIsIHZlcnRleE9iamVjdCk7 CiAgICAgICAgICAgICBnbC5idWZmZXJEYXRhKGdsLkFSUkFZX0JVRkZFUiwgMTAyNCwgZ2wuU1RB VElDX0RSQVcpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvd2ViZ2wvMi4wLjAvcmVzb3VyY2Vz L3dlYmdsX3Rlc3RfZmlsZXMvY29uZm9ybWFuY2UvYXR0cmlicy9nbC12ZXJ0ZXhhdHRyaWJwb2lu dGVyLmh0bWwgYi9MYXlvdXRUZXN0cy93ZWJnbC8yLjAuMC9yZXNvdXJjZXMvd2ViZ2xfdGVzdF9m aWxlcy9jb25mb3JtYW5jZS9hdHRyaWJzL2dsLXZlcnRleGF0dHJpYnBvaW50ZXIuaHRtbAppbmRl eCA3YWFkZjYwZGE1NmM2ZDZhZmViNTcyZjZlNTNmZmQzMWJhNWU0ODQzLi41MmQ0MTE3MzI5ZDY2 MmE1M2ZiYzdhMmVmMjFiN2RhOTBmMGVmNzVjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy93ZWJn bC8yLjAuMC9yZXNvdXJjZXMvd2ViZ2xfdGVzdF9maWxlcy9jb25mb3JtYW5jZS9hdHRyaWJzL2ds LXZlcnRleGF0dHJpYnBvaW50ZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy93ZWJnbC8yLjAuMC9y ZXNvdXJjZXMvd2ViZ2xfdGVzdF9maWxlcy9jb25mb3JtYW5jZS9hdHRyaWJzL2dsLXZlcnRleGF0 dHJpYnBvaW50ZXIuaHRtbApAQCAtMSwyOCArMSw3IEBACiA8IS0tCi0KLS8qCi0qKiBDb3B5cmln aHQgKGMpIDIwMTIgVGhlIEtocm9ub3MgR3JvdXAgSW5jLgotKioKLSoqIFBlcm1pc3Npb24gaXMg aGVyZWJ5IGdyYW50ZWQsIGZyZWUgb2YgY2hhcmdlLCB0byBhbnkgcGVyc29uIG9idGFpbmluZyBh Ci0qKiBjb3B5IG9mIHRoaXMgc29mdHdhcmUgYW5kL29yIGFzc29jaWF0ZWQgZG9jdW1lbnRhdGlv biBmaWxlcyAodGhlCi0qKiAiTWF0ZXJpYWxzIiksIHRvIGRlYWwgaW4gdGhlIE1hdGVyaWFscyB3 aXRob3V0IHJlc3RyaWN0aW9uLCBpbmNsdWRpbmcKLSoqIHdpdGhvdXQgbGltaXRhdGlvbiB0aGUg cmlnaHRzIHRvIHVzZSwgY29weSwgbW9kaWZ5LCBtZXJnZSwgcHVibGlzaCwKLSoqIGRpc3RyaWJ1 dGUsIHN1YmxpY2Vuc2UsIGFuZC9vciBzZWxsIGNvcGllcyBvZiB0aGUgTWF0ZXJpYWxzLCBhbmQg dG8KLSoqIHBlcm1pdCBwZXJzb25zIHRvIHdob20gdGhlIE1hdGVyaWFscyBhcmUgZnVybmlzaGVk IHRvIGRvIHNvLCBzdWJqZWN0IHRvCi0qKiB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnM6Ci0qKgot KiogVGhlIGFib3ZlIGNvcHlyaWdodCBub3RpY2UgYW5kIHRoaXMgcGVybWlzc2lvbiBub3RpY2Ug c2hhbGwgYmUgaW5jbHVkZWQKLSoqIGluIGFsbCBjb3BpZXMgb3Igc3Vic3RhbnRpYWwgcG9ydGlv bnMgb2YgdGhlIE1hdGVyaWFscy4KLSoqCi0qKiBUSEUgTUFURVJJQUxTIEFSRSBQUk9WSURFRCAi QVMgSVMiLCBXSVRIT1VUIFdBUlJBTlRZIE9GIEFOWSBLSU5ELAotKiogRVhQUkVTUyBPUiBJTVBM SUVELCBJTkNMVURJTkcgQlVUIE5PVCBMSU1JVEVEIFRPIFRIRSBXQVJSQU5USUVTIE9GCi0qKiBN RVJDSEFOVEFCSUxJVFksIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFORCBOT05J TkZSSU5HRU1FTlQuCi0qKiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQVVUSE9SUyBPUiBDT1BZUklH SFQgSE9MREVSUyBCRSBMSUFCTEUgRk9SIEFOWQotKiogQ0xBSU0sIERBTUFHRVMgT1IgT1RIRVIg TElBQklMSVRZLCBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBDT05UUkFDVCwKLSoqIFRPUlQgT1Ig T1RIRVJXSVNFLCBBUklTSU5HIEZST00sIE9VVCBPRiBPUiBJTiBDT05ORUNUSU9OIFdJVEggVEhF Ci0qKiBNQVRFUklBTFMgT1IgVEhFIFVTRSBPUiBPVEhFUiBERUFMSU5HUyBJTiBUSEUgTUFURVJJ QUxTLgotKi8KLQorQ29weXJpZ2h0IChjKSAyMDE5IFRoZSBLaHJvbm9zIEdyb3VwIEluYy4KK1Vz ZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNl IHRoYXQgY2FuIGJlCitmb3VuZCBpbiB0aGUgTElDRU5TRS50eHQgZmlsZS4KIC0tPgogCiA8IURP Q1RZUEUgaHRtbD4KQEAgLTczLDEwICs1MiwxMCBAQCBpZiAoIWdsKSB7CiAgIGdsLnZlcnRleEF0 dHJpYlBvaW50ZXIoMCwgMSwgZ2wuRkxPQVQsIGZhbHNlLCAwLCAwKTsKICAgd3R1LmdsRXJyb3JT aG91bGRCZShnbCwgZ2wuTk9fRVJST1IpOwogCi0gIC8vZ2wuYmluZEJ1ZmZlcihnbC5BUlJBWV9C VUZGRVIsIG51bGwpOwotICAvL2dsLnZlcnRleEF0dHJpYlBvaW50ZXIoMCwgMSwgZ2wuRkxPQVQs IGZhbHNlLCAwLCAwKTsKLSAgLy93dHUuZ2xFcnJvclNob3VsZEJlKGdsLCBnbC5OT19FUlJPUiwK LSAgLy8gICAgInZlcnRleEF0dHJpYlBvaW50ZXIgc2hvdWxkIHN1Y2NlZWQgaWYgbm8gYnVmZmVy IGlzIGJvdW5kIGFuZCBgb2Zmc2V0YCBpcyB6ZXJvLiIpOworICBnbC5iaW5kQnVmZmVyKGdsLkFS UkFZX0JVRkZFUiwgbnVsbCk7CisgIGdsLnZlcnRleEF0dHJpYlBvaW50ZXIoMCwgMSwgZ2wuRkxP QVQsIGZhbHNlLCAwLCAwKTsKKyAgd3R1LmdsRXJyb3JTaG91bGRCZShnbCwgZ2wuTk9fRVJST1Is CisgICAgICAidmVydGV4QXR0cmliUG9pbnRlciBzaG91bGQgc3VjY2VlZCBpZiBubyBidWZmZXIg aXMgYm91bmQgYW5kIGBvZmZzZXRgIGlzIHplcm8uIik7CiAKICAgZ2wuYmluZEJ1ZmZlcihnbC5B UlJBWV9CVUZGRVIsIHZlcnRleE9iamVjdCk7CiAKQEAgLTg4LDEwICs2NywxMCBAQCBpZiAoIWds KSB7CiAgICAgZ2wudmVydGV4QXR0cmliUG9pbnRlcigwLCAxLCBnbC5VTlNJR05FRF9JTlQsIDAs IDAsIDApOwogICAgIHd0dS5nbEVycm9yU2hvdWxkQmUoZ2wsIGdsLklOVkFMSURfRU5VTSwKICAg ICAgICAgICAgICJ2ZXJ0ZXhBdHRyaWJQb2ludGVyIHNob3VsZCBub3Qgc3VwcG9ydCBVTlNJR05F RF9JTlQiKTsKLSAgICBnbC52ZXJ0ZXhBdHRyaWJQb2ludGVyKDAsIDEsIGdsLkZJWEVELCAwLCAw LCAwKTsKLSAgICB3dHUuZ2xFcnJvclNob3VsZEJlKGdsLCBnbC5JTlZBTElEX0VOVU0sCi0gICAg ICAgICAgICAidmVydGV4QXR0cmliUG9pbnRlciBzaG91bGQgbm90IHN1cHBvcnQgRklYRUQiKTsK ICAgfQorICBnbC52ZXJ0ZXhBdHRyaWJQb2ludGVyKDAsIDEsIGdsLkZJWEVELCAwLCAwLCAwKTsK KyAgd3R1LmdsRXJyb3JTaG91bGRCZShnbCwgZ2wuSU5WQUxJRF9FTlVNLAorICAgICAgICAgICJ2 ZXJ0ZXhBdHRyaWJQb2ludGVyIHNob3VsZCBub3Qgc3VwcG9ydCBGSVhFRCIpOwogCiAgIHZhciBj aGVja1ZlcnRleEF0dHJpYlBvaW50ZXIgPSBmdW5jdGlvbigKICAgICAgIGdsLCBlcnIsIHJlYXNv biwgc2l6ZSwgdHlwZSwgbm9ybWFsaXplLCBzdHJpZGUsIG9mZnNldCkgewpAQCAtMTIxLDYgKzEw MCwxNiBAQCBpZiAoIWdsKSB7CiAgICAgeyB0eXBlOmdsLkZMT0FULCAgICAgICAgICBieXRlc1Bl ckNvbXBvbmVudDogNCB9LAogICBdOwogCisgIGlmICh3dHUuZ2V0RGVmYXVsdDNEQ29udGV4dFZl cnNpb24oKSA+PSAyKSB7CisgICAgdHlwZXMucHVzaCguLi5bCisgICAgICAgIHsgdHlwZTpnbC5J TlQsICAgICAgICAgICAgICAgICAgICAgICAgIGJ5dGVzUGVyQ29tcG9uZW50OiA0IH0sCisgICAg ICAgIHsgdHlwZTpnbC5VTlNJR05FRF9JTlQsICAgICAgICAgICAgICAgIGJ5dGVzUGVyQ29tcG9u ZW50OiA0IH0sCisgICAgICAgIHsgdHlwZTpnbC5IQUxGX0ZMT0FULCAgICAgICAgICAgICAgICAg IGJ5dGVzUGVyQ29tcG9uZW50OiAyIH0sCisgICAgICAgIHsgdHlwZTpnbC5JTlRfMl8xMF8xMF8x MF9SRVYsICAgICAgICAgIGJ5dGVzUGVyQ29tcG9uZW50OiA0LCBtaW5TaXplOiA0IH0sCisgICAg ICAgIHsgdHlwZTpnbC5VTlNJR05FRF9JTlRfMl8xMF8xMF8xMF9SRVYsIGJ5dGVzUGVyQ29tcG9u ZW50OiA0LCBtaW5TaXplOiA0IH0sCisgICAgICBdKTsKKyAgfQorCiAgIGZvciAodmFyIGlpID0g MDsgaWkgPCB0eXBlcy5sZW5ndGg7ICsraWkpIHsKICAgICB2YXIgaW5mbyA9IHR5cGVzW2lpXTsK ICAgICBkZWJ1ZygiIik7CkBAIC0xNDksNiArMTM4LDEwIEBAIGlmICghZ2wpIHsKICAgICAgICAg ICAgIHJlYXNvbiA9ICJiZWNhdXNlIHN0cmlkZSBpcyBiYWQiOwogICAgICAgICAgICAgZXJyID0g Z2wuSU5WQUxJRF9PUEVSQVRJT047CiAgICAgICAgICAgfQorICAgICAgICAgIGlmIChzaXplIDwg aW5mby5taW5TaXplKSB7CisgICAgICAgICAgICByZWFzb24gPSAiYmVjYXVzZSBzaXplIDwgbWlu U2l6ZSI7CisgICAgICAgICAgICBlcnIgPSBnbC5JTlZBTElEX09QRVJBVElPTjsKKyAgICAgICAg ICB9CiAgICAgICAgICAgY2hlY2tWZXJ0ZXhBdHRyaWJQb2ludGVyKAogICAgICAgICAgICAgICBn bCwgZXJyLCByZWFzb24sIHNpemUsIGluZm8udHlwZSwgZmFsc2UsIHN0cmlkZSwgb2Zmc2V0KTsK ICAgICAgICAgfQpAQCAtMTU2LDEwICsxNDksMTAgQEAgaWYgKCFnbCkgewogCiAgICAgICAgIGlm IChvZmZzZXQgPT0gMCkgewogICAgICAgICAgIGNoZWNrVmVydGV4QXR0cmliUG9pbnRlcigKLSAg ICAgICAgICAgICAgZ2wsIGdsLk5PX0VSUk9SLCAiYXQgc3RyaWRlIGxpbWl0IiwKKyAgICAgICAg ICAgICAgZ2wsIHNpemUgPCBpbmZvLm1pblNpemUgPyBnbC5JTlZBTElEX09QRVJBVElPTiA6IGds Lk5PX0VSUk9SLCAiYXQgc3RyaWRlIGxpbWl0IiwKICAgICAgICAgICAgICAgc2l6ZSwgaW5mby50 eXBlLCBmYWxzZSwgc3RyaWRlLCBvZmZzZXQpOwogICAgICAgICAgIGNoZWNrVmVydGV4QXR0cmli UG9pbnRlcigKLSAgICAgICAgICAgICAgZ2wsIGdsLklOVkFMSURfVkFMVUUsICJvdmVyIHN0cmlk ZSBsaW1pdCIsCisgICAgICAgICAgICAgIGdsLCBzaXplIDwgaW5mby5taW5TaXplID8gZ2wuSU5W QUxJRF9PUEVSQVRJT04gOiBnbC5JTlZBTElEX1ZBTFVFLCAib3ZlciBzdHJpZGUgbGltaXQiLAog ICAgICAgICAgICAgICBzaXplLCBpbmZvLnR5cGUsIGZhbHNlLAogICAgICAgICAgICAgICBzdHJp ZGUgKyBpbmZvLmJ5dGVzUGVyQ29tcG9uZW50LCBvZmZzZXQpOwogICAgICAgICB9Cg==