96828 2012-09-14 15:08:37 -0700 webgl/1.0.4/conformance/extensions/oes-vertex-array-object.html fails 2021-08-03 01:06:24 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All NEW InRadar P2 Normal --- 96578 222812 1 bajones webkit-unassigned cdumez changseok dino esprehn+autocc estea ews-watchlist gyuyoung.kim kkinnunen kondapallykalyan oldest_to_newest 721172 0 bajones 2012-09-14 15:08:37 -0700 fast/canvas/webgl/oes-vertex-array-object.html has been added to the skipped test files for most platforms. (https://bugs.webkit.org/show_bug.cgi?id=96578) As various platforms are confirmed to support the OES_vertex_array_object extension they should re-enable this test. 1063483 1 ap 2015-01-22 15:09:16 -0800 rdar://problem/17258149 1740612 2 kkinnunen 2021-03-17 02:04:44 -0700 *** Bug 223372 has been marked as a duplicate of this bug. *** 1740616 3 kkinnunen 2021-03-17 02:19:43 -0700 webgl/1.0.4/conformance/extensions/oes-vertex-array-object.html fails on iOS-simulator --- /Users/kkinnunen/Build/Release-iphonesimulator/layout-test-results/webgl/1.0.4/conformance/extensions/oes-vertex-array-object-expected.txt +++ /Users/kkinnunen/Build/Release-iphonesimulator/layout-test-results/webgl/1.0.4/conformance/extensions/oes-vertex-array-object-actual.txt @@ -1,4 +1,76 @@ This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL. Test: ../../../resources/webgl_test_files/conformance/extensions/oes-vertex-array-object.html -[ PASS ] All tests passed + +[ 1: PASS ] WebGL context exists +[ 2: PASS ] getError was expected value: INVALID_ENUM : VERTEX_ARRAY_BINDING_OES should not be queryable if extension is disabled +[ 3: PASS ] Successfully enabled OES_vertex_array_object extension +[ 4: PASS ] OES_vertex_array_object listed as supported and getExtension succeeded +[ 5: PASS ] ext.VERTEX_ARRAY_BINDING_OES is 0x85B5 +[ 6: PASS ] getError was expected value: NO_ERROR : VERTEX_ARRAY_BINDING_OES query should succeed if extension is enabled +[ 7: PASS ] Default value of VERTEX_ARRAY_BINDING_OES is null +[ 8: PASS ] gl.getParameter(ext.VERTEX_ARRAY_BINDING_OES) is null +[ 9: PASS ] gl.getParameter(ext.VERTEX_ARRAY_BINDING_OES) is expected VAO +[ 10: PASS ] gl.getParameter(ext.VERTEX_ARRAY_BINDING_OES) is expected VAO +[ 11: PASS ] gl.getParameter(ext.VERTEX_ARRAY_BINDING_OES) is null +[ 12: PASS ] getError was expected value: INVALID_OPERATION : binding a deleted vertex array object +[ 13: PASS ] gl.getParameter(ext.VERTEX_ARRAY_BINDING_OES) is null +[ 14: PASS ] getError was expected value: NO_ERROR : createVertexArrayOES should not set an error +[ 15: PASS ] vao is non-null. +[ 16: PASS ] ext.isVertexArrayOES(vao) is false +[ 17: PASS ] ext.isVertexArrayOES(vao) is true +[ 18: PASS ] ext.isVertexArrayOES(vao) is true +[ 19: PASS ] ext.isVertexArrayOES(null) is false +[ 20: PASS ] All attributes preserved across bindings +[ 21: PASS ] Vertex attribute values are not attached to bindings +[ 22: PASS ] Drawing with the default VAO should pass +[ 23: PASS ] Drawing with the default VAO should pass +[ 24: PASS ] Drawing with the default VAO should pass +[ 25: PASS ] Drawing with the default VAO should pass +[ 26: PASS ] Drawing with the default VAO should pass +[ 27: PASS ] Drawing with the default VAO should pass +[ 28: PASS ] Drawing with VAO #0 should pass +[ 29: PASS ] Drawing with VAO #0 should pass +[ 30: PASS ] Drawing with VAO #0 should pass +[ 31: PASS ] Drawing with VAO #0 should pass +[ 32: PASS ] Drawing with VAO #0 should pass +[ 33: PASS ] Drawing with VAO #0 should pass +[ 34: PASS ] Drawing with VAO #1 should pass +[ 35: PASS ] Drawing with VAO #1 should pass +[ 36: PASS ] Drawing with VAO #1 should pass +[ 37: PASS ] Drawing with VAO #1 should pass +[ 38: PASS ] Drawing with VAO #1 should pass +[ 39: PASS ] Drawing with VAO #1 should pass +[ 40: PASS ] Drawing with VAO that has the color array disabled should pass +[ 41: PASS ] Drawing with VAO that has the color array disabled should pass +[ 42: PASS ] Drawing with VAO that has the color array disabled should pass +[ 43: PASS ] Drawing with VAO that has the color array disabled should pass +[ 44: PASS ] Drawing with VAO that has the color array disabled should pass +[ 45: PASS ] Drawing with VAO that has the color array disabled should pass +[ 46: PASS ] Drawing after deleting another VAO should pass +[ 47: PASS ] Drawing after deleting another VAO should pass +[ 48: PASS ] Drawing after deleting another VAO should pass +[ 49: PASS ] Drawing after deleting another VAO should pass +[ 50: PASS ] Drawing after deleting another VAO should pass +[ 51: PASS ] Drawing after deleting another VAO should pass +[ 52: PASS ] Drawing after deleting the VAO that was bound should pass +[ 53: PASS ] Drawing after deleting the VAO that was bound should pass +[ 54: PASS ] Drawing after deleting the VAO that was bound should pass +[ 55: PASS ] Drawing after deleting the VAO that was bound should pass +[ 56: PASS ] Drawing after deleting the VAO that was bound should pass +[ 57: PASS ] Drawing after deleting the VAO that was bound should pass +[ 58: PASS ] should be green +[ 59: PASS ] should be green +[ 60: PASS ] should be 255,0,0,255 +[ 61: PASS ] should be 0,255,0,255 +[ 62: PASS ] should be 0,0,255,255 +[ 63: PASS ] should be 0,255,255,255 +[ 64: FAIL ] getError expected: INVALID_OPERATION. Was NO_ERROR : Draw call should fail. +[ 65: PASS ] getError was expected value: NO_ERROR : Draw call should not fail. +[ 66: PASS ] getError was expected value: NO_ERROR : Draw call should not fail. +[ 67: PASS ] getError was expected value: NO_ERROR : Draw call should not fail. +[ 68: PASS ] should be red +[ 69: PASS ] should be green +[ 70: PASS ] getError was expected value: NO_ERROR : there should be no errors +[ 71: PASS ] successfullyParsed is true +[ FAIL ] 1 failures reported 1740617 4 kkinnunen 2021-03-17 02:21:00 -0700 https://www.khronos.org/registry/webgl/sdk/tests/conformance/extensions/oes-vertex-array-object.html?webglVersion=1&quiet=0&quick=1 1777149 5 433567 estea 2021-07-15 01:01:30 -0700 Created attachment 433567 Patch 1777150 6 estea 2021-07-15 01:06:01 -0700 I've taken a look at this bug, drawing with the 0 (null in webgl) VAO was not possible because internally we didn't bind the default object but we were calling glBindVertexArray(0), where 0 is the invalid object. Besides we didn't create/delete the default object. OpenGL versions >= 3.0 require VAOs for rendering, and so we should always bind the secret default VAO when no other VAO is bound in the WebGL implementation. The patch above seems to fix the drawing errors (DrawTests) in GTK, but I haven't tested it in other platforms. 1777155 7 estea 2021-07-15 01:40:18 -0700 Including GLContext.h breaks the other builds, I'll try to fix this. 1777165 8 433573 estea 2021-07-15 03:10:14 -0700 Created attachment 433573 Patch 1781563 9 433573 kkinnunen 2021-08-03 01:06:24 -0700 Comment on attachment 433573 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=433573&action=review Thanks for the patch. I'm not sure this approach works for the default case where ANGLE is being used. Note: supporting WebGL *correctly* on top of OpenGL is very demanding. This is what ANGLE is currently implementing, e.g. most probably in the end the implementation would amount to almost re-implementing ANGLE. This would indicate that it would maybe be more fruitful to work on getting WPE,GLIB, et al be able to run WebGL with ANGLE. There should not be any architectural problems, but of course it's a bit of a grind. > Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.cpp:33 > +#include "GLContext.h" The GLContext.h is an implementation detail of the ports that implement compositor with "texture mapper", e.g. GLIB/WPE/.. , non-apple ports. In the WebCore WebGL implementation level, this cannot be used. We should use GraphicsContextGL abstraction in this level. I'm not very knowledgeable in the way current non-ANGLE implementation is simulating this VAO feature. However, it probably should follow the structure similar to what is being done in functions such as WebGLRenderingContextBase::validateVertexAttributes. 433567 2021-07-15 01:01:30 -0700 2021-07-15 03:10:08 -0700 Patch bug-96828-20210715110022.patch text/plain 6795 estea U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5OTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGFmMjYzMmRmMTU5ZDcw MDc4YzA0Y2FjYTVkYzczZTY3YWZmODk1NC4uZmE2ZDM2MzkxMTJlZmI4ZWFmZTQxYTIyNzM5YzYx OTdmMmI2ZDNjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTA3LTE1ICBFbGVu aSBNYXJpYSBTdGVhICA8ZXN0ZWFAaWdhbGlhLmNvbT4KKworICAgICAgICBBbHdheXMgdXNlIHRo ZSBkZWZhdWx0IHZlcnRleCBhcnJheSBvYmplY3Qgd2l0aCBPcGVuR0wgPiAzLjAKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2ODI4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gT3BlbkdMIHZlcnNpb25z IDMuMCBhbmQgb24gaXQgaXMgcmVxdWlyZWQgdG8gdXNlIHZlcnRleCBhcnJheXMKKyAgICAgICAg Zm9yIHJlbmRlcmluZy4gVGhlcmVmb3JlLCB3aGVuIHVzZXIgY2FsbHMgZ2xCaW5kVmVydGV4QXJy YXkoMCkgb3IKKyAgICAgICAgZ2wuQmluZFZlcnRleEFycmF5KG51bGwpIGZyb20gV2ViR0wsIHdl IGNhbid0IHNpbXBseSBiaW5kIHRoZSAwCisgICAgICAgIChpbnZhbGlkKSBvYmplY3QuIFdlIG5l ZWQgdG8gaGF2ZSBhIGRlZmF1bHQgb2JqZWN0IGFuZCBiaW5kIGl0IHNvCisgICAgICAgIHNvIHRo YXQgZm9sbG93IHVwIGNhbGxzIHRvIGdsRHJhd0FycmF5cy9nbERyYXdFbGVtZW50cyBldGMgY2Fu CisgICAgICAgIHN0aWxsIHdvcmsuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBpdCBmaXhlcyB0 aGUgRHJhd1Rlc3RzIG9mCisgICAgICAgIExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL29l cy12ZXJ0ZXgtYXJyYXktb2JqZWN0Lmh0bWwKKworICAgICAgICAqIGh0bWwvY2FudmFzL09FU1Zl cnRleEFycmF5T2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok9FU1ZlcnRleEFycmF5T2Jq ZWN0OjpkZWxldGVWZXJ0ZXhBcnJheU9FUyk6CisgICAgICAgIChXZWJDb3JlOjpPRVNWZXJ0ZXhB cnJheU9iamVjdDo6YmluZFZlcnRleEFycmF5T0VTKToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9X ZWJHTE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTE9iamVjdDo6ZGVsZXRlT2Jq ZWN0KToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFZlcnRleEFycmF5T2JqZWN0T0VTLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMVmVydGV4QXJyYXlPYmplY3RPRVM6OldlYkdMVmVy dGV4QXJyYXlPYmplY3RPRVMpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xWZXJ0ZXhBcnJheU9i amVjdE9FUzo6ZGVsZXRlT2JqZWN0SW1wbCk6CisKIDIwMjEtMDctMTQgIEFsZXggQ2hyaXN0ZW5z ZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBMaW5rIGFnYWluc3QgQ2F0 YWx5c3QgQU5HTEUtc2hhcmVkLmR5bGliIHdoZW4gbGlua2luZyBDYXRhbHlzdCBXZWJDb3JlLmZy YW1ld29yawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvT0VTVmVydGV4 QXJyYXlPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvT0VTVmVydGV4QXJy YXlPYmplY3QuY3BwCmluZGV4IDMwZDRiM2ZmMGNiZDI0ZjUzODA4NjMwYmNjNDMwNjdkOGNlOGYw NmQuLjUyZjk2ZmQxMDg0NjAyODgyMTk2MDQwNTdkNWU2MzAwMDUxZGJlNjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL09FU1ZlcnRleEFycmF5T2JqZWN0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9PRVNWZXJ0ZXhBcnJheU9iamVjdC5jcHAKQEAg LTY1LDcgKzY1LDExIEBAIHZvaWQgT0VTVmVydGV4QXJyYXlPYmplY3Q6OmRlbGV0ZVZlcnRleEFy cmF5T0VTKFdlYkdMVmVydGV4QXJyYXlPYmplY3RPRVMqIGFycmF5CiAKICAgICBMb2NrZXIgbG9j a2VyIHsgbV9jb250ZXh0LT5vYmplY3RHcmFwaExvY2soKSB9OwogCi0gICAgaWYgKCFhcnJheU9i amVjdCB8fCBtX2NvbnRleHQtPmlzQ29udGV4dExvc3QoKSkKKyAgICAvLyB3ZSBzaG91bGRuJ3Qg bGV0IHRoZSB1c2VyIGRlbGV0ZSB0aGUgZGVmYXVsdCBvYmplY3QsCisgICAgLy8gZnJvbSBPRVNf dmVydGV4X2FycmF5X29iamVjdC9nbERlbGV0ZVZlcnRleEFycmF5c09FUzoKKyAgICAvLyBVbnVz ZWQgbmFtZXMgaW4gPGFycmF5cz4gYXJlIHNpbGVudGx5IGlnbm9yZWQsIGFzIGlmIHRoZXkgaGF2 ZQorICAgIC8vIHRoZSB2YWx1ZSB6ZXJvLgorICAgIGlmICghYXJyYXlPYmplY3QgfHwgbV9jb250 ZXh0LT5pc0NvbnRleHRMb3N0KCkgfHwgYXJyYXlPYmplY3QtPmlzRGVmYXVsdE9iamVjdCgpKQog ICAgICAgICByZXR1cm47CiAKICAgICBpZiAoIWFycmF5T2JqZWN0LT5pc0RlZmF1bHRPYmplY3Qo KSAmJiBhcnJheU9iamVjdCA9PSBzdGF0aWNfY2FzdDxXZWJHTFJlbmRlcmluZ0NvbnRleHQqPiht X2NvbnRleHQpLT5tX2JvdW5kVmVydGV4QXJyYXlPYmplY3QpCkBAIC0xMDAsMTMgKzEwNCwxNSBA QCB2b2lkIE9FU1ZlcnRleEFycmF5T2JqZWN0OjpiaW5kVmVydGV4QXJyYXlPRVMoV2ViR0xWZXJ0 ZXhBcnJheU9iamVjdE9FUyogYXJyYXlPYgogCiAgICAgYXV0byogY29udGV4dEdMID0gbV9jb250 ZXh0LT5ncmFwaGljc0NvbnRleHRHTCgpOwogICAgIGF1dG8mIGNvbnRleHQgPSBkb3duY2FzdDxX ZWJHTFJlbmRlcmluZ0NvbnRleHQ+KCptX2NvbnRleHQpOwotICAgIGlmIChhcnJheU9iamVjdCAm JiAhYXJyYXlPYmplY3QtPmlzRGVmYXVsdE9iamVjdCgpICYmIGFycmF5T2JqZWN0LT5vYmplY3Qo KSkgeworCisgICAgaWYgKGFycmF5T2JqZWN0ICYmIGFycmF5T2JqZWN0LT5vYmplY3QoKSkgewog ICAgICAgICBjb250ZXh0R0wtPmJpbmRWZXJ0ZXhBcnJheShhcnJheU9iamVjdC0+b2JqZWN0KCkp OwogICAgICAgICBhcnJheU9iamVjdC0+c2V0SGFzRXZlckJlZW5Cb3VuZCgpOwogICAgICAgICBj b250ZXh0LnNldEJvdW5kVmVydGV4QXJyYXlPYmplY3QobG9ja2VyLCBhcnJheU9iamVjdCk7CiAg ICAgfSBlbHNlIHsKLSAgICAgICAgY29udGV4dEdMLT5iaW5kVmVydGV4QXJyYXkoMCk7Ci0gICAg ICAgIGNvbnRleHQuc2V0Qm91bmRWZXJ0ZXhBcnJheU9iamVjdChsb2NrZXIsIG51bGxwdHIpOwor ICAgICAgICBjb250ZXh0Lm1fZGVmYXVsdFZlcnRleEFycmF5T2JqZWN0LT5zZXRIYXNFdmVyQmVl bkJvdW5kKCk7CisgICAgICAgIGNvbnRleHRHTC0+YmluZFZlcnRleEFycmF5KGNvbnRleHQubV9k ZWZhdWx0VmVydGV4QXJyYXlPYmplY3QtPm9iamVjdCgpKTsKKyAgICAgICAgY29udGV4dC5zZXRC b3VuZFZlcnRleEFycmF5T2JqZWN0KGxvY2tlciwgY29udGV4dC5tX2RlZmF1bHRWZXJ0ZXhBcnJh eU9iamVjdC5nZXQoKSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL2NhbnZhcy9XZWJHTE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9X ZWJHTE9iamVjdC5jcHAKaW5kZXggZjI4MDgwMzM2MWJlYzYwMjliMjBkY2NhZjA4MTIzMDhhMTIy Y2Q4YS4uZGM1N2M2ODQ1YjQ5ZTcyODE2MGIxN2Y0MThlYmU2ZjJkZjBhZDcyMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xPYmplY3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMT2JqZWN0LmNwcApAQCAtNzMsMTAgKzczLDkgQEAg dm9pZCBXZWJHTE9iamVjdDo6ZGVsZXRlT2JqZWN0KGNvbnN0IEFic3RyYWN0TG9ja2VyJiBsb2Nr ZXIsIEdyYXBoaWNzQ29udGV4dEdMKgogCiAgICAgICAgIGlmIChjb250ZXh0M2QpCiAgICAgICAg ICAgICBkZWxldGVPYmplY3RJbXBsKGxvY2tlciwgY29udGV4dDNkLCBtX29iamVjdCk7Ci0gICAg fQogCi0gICAgaWYgKCFtX2F0dGFjaG1lbnRDb3VudCkKICAgICAgICAgbV9vYmplY3QgPSAwOwor ICAgIH0KIH0KIAogdm9pZCBXZWJHTE9iamVjdDo6ZGV0YWNoKCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMVmVydGV4QXJyYXlPYmplY3RPRVMuY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xWZXJ0ZXhBcnJheU9iamVjdE9FUy5jcHAKaW5k ZXggMTEwY2M3NzVhNGZkNzhlYTMyOTM0YTU2MDFiNDk1YjJkOWUwZDVmMi4uZTFlZDI2MDlkZjYw Yzk1YTAzODkwZjVkZDJjNWVmY2IwMDNlNzQ1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9jYW52YXMvV2ViR0xWZXJ0ZXhBcnJheU9iamVjdE9FUy5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9jYW52YXMvV2ViR0xWZXJ0ZXhBcnJheU9iamVjdE9FUy5jcHAKQEAgLTMwLDYg KzMwLDcgQEAKICNpbmNsdWRlICJXZWJHTFZlcnRleEFycmF5T2JqZWN0T0VTLmgiCiAKICNpbmNs dWRlICJFeHRlbnNpb25zR0wuaCIKKyNpbmNsdWRlICJHTENvbnRleHQuaCIKICNpbmNsdWRlICJX ZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTQy LDEzICs0MywxOSBAQCBSZWY8V2ViR0xWZXJ0ZXhBcnJheU9iamVjdE9FUz4gV2ViR0xWZXJ0ZXhB cnJheU9iamVjdE9FUzo6Y3JlYXRlKFdlYkdMUmVuZGVyaW5nQwogV2ViR0xWZXJ0ZXhBcnJheU9i amVjdE9FUzo6V2ViR0xWZXJ0ZXhBcnJheU9iamVjdE9FUyhXZWJHTFJlbmRlcmluZ0NvbnRleHRC YXNlJiBjb250ZXh0LCBUeXBlIHR5cGUpCiAgICAgOiBXZWJHTFZlcnRleEFycmF5T2JqZWN0QmFz ZShjb250ZXh0LCB0eXBlKQogewotICAgIHN3aXRjaCAodHlwZSkgewotICAgIGNhc2UgVHlwZTo6 RGVmYXVsdDoKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBUeXBlOjpVc2VyOgorICAgIHVpbnQ2 NF90IHZlcnNpb24gPSBHTENvbnRleHQ6OmN1cnJlbnQoKS0+dmVyc2lvbigpOworICAgIC8vIE9w ZW5HTCAzLjAgYW5kIG9uIHJlcXVpcmUgVkFPcyBmb3IgcmVuZGVyaW5nIG9iamVjdHMuIEFjY29y ZGluZyB0bworICAgIC8vIHNlY3Rpb24gMi4xMCBvZiB0aGUgT3BlbkdMIHJlZmVyZW5jZSAodGl0 bGU6ICJWZXJ0ZXggQXJyYXkgT2JqZWN0cyIpCisgICAgLy8gZm9yIGdsRGVsZXRlVmVydGV4QXJy YXlzOgorICAgIC8vIElmIGEgdmVydGV4IGFycmF5IG9iamVjdCB0aGF0IGlzIGN1cnJlbnRseSBi b3VuZCBpcyBkZWxldGVkLCB0aGUKKyAgICAvLyBiaW5kaW5nIGZvciB0aGF0IG9iamVjdCByZXZl cnRzIHRvIHplcm8gYW5kIHRoZSBkZWZhdWx0IHZlcnRleCBhcnJheQorICAgIC8vIGJlY29tZXMg Y3VycmVudC4gVW51c2VkIG5hbWVzIGluIGFycmF5cyBhcmUgc2lsZW50bHkgaWdub3JlZCwgYXMg aXMgdGhlCisgICAgLy8gdmFsdWUgemVyby4KKyAgICAvLyBUaGlzIHBhcmFncmFwaCBpbXBsaWVz IHRoYXQ6IHdlIG5lZWQgdG8gKmFsd2F5cyogY3JlYXRlIGEgZGVmYXVsdCBWQU8uCisgICAgLy8g Q3JlYXRpbmcgdGhlIGRlZmF1bHQgb2JqZWN0IGlzIGFsc28gcmVxdWlyZWQgc28gdGhhdCB3ZSBj YW4gc3RpbGwgcmVuZGVyCisgICAgLy8gd2hlbiB3ZSBjYWxsIGdsLmJpbmRWZXJ0ZXhBcnJheShu dWxsKSBpbiBXZWJHTC4gKE1ha2VzIHZhbyB0ZXN0cyBwYXNzKQorICAgIGlmICh0eXBlID09IFR5 cGU6OlVzZXIgfHwgKHZlcnNpb24gPj0gMzAwKSkKICAgICAgICAgc2V0T2JqZWN0KHRoaXMtPmNv bnRleHQoKS0+Z3JhcGhpY3NDb250ZXh0R0woKS0+Y3JlYXRlVmVydGV4QXJyYXkoKSk7Ci0gICAg ICAgIGJyZWFrOwotICAgIH0KIH0KIAogV2ViR0xWZXJ0ZXhBcnJheU9iamVjdE9FUzo6fldlYkdM VmVydGV4QXJyYXlPYmplY3RPRVMoKQpAQCAtNjEsMTMgKzY4LDE0IEBAIFdlYkdMVmVydGV4QXJy YXlPYmplY3RPRVM6On5XZWJHTFZlcnRleEFycmF5T2JqZWN0T0VTKCkKIAogdm9pZCBXZWJHTFZl cnRleEFycmF5T2JqZWN0T0VTOjpkZWxldGVPYmplY3RJbXBsKGNvbnN0IFdURjo6QWJzdHJhY3RM b2NrZXImIGxvY2tlciwgR3JhcGhpY3NDb250ZXh0R0wqIGNvbnRleHQzZCwgUGxhdGZvcm1HTE9i amVjdCBvYmplY3QpCiB7Ci0gICAgc3dpdGNoIChtX3R5cGUpIHsKLSAgICBjYXNlIFR5cGU6OkRl ZmF1bHQ6Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgVHlwZTo6VXNlcjoKKyAgICB1aW50NjRf dCB2ZXJzaW9uID0gR0xDb250ZXh0OjpjdXJyZW50KCktPnZlcnNpb24oKTsKKyAgICAvLyBTZWUg YWxzbzogdGhlIGNvbnN0cnVjdG9yIGFib3ZlLgorICAgIC8vIFRoaXMgZnVuY3Rpb24gaXMgY2Fs bGVkIHdoZW4gdGhlIHZhbyBkZXN0cnVjdG9yIGlzIGNhbGxlZC4KKyAgICAvLyBXZSBjYW4gYWxz byB1c2UgaXQgdG8gZGVsZXRlIHRoZSBkZWZhdWx0IHZlcnRleCBhcnJheSBhcyB3ZQorICAgIC8v IGFscmVhZHkgbWFkZSBzdXJlIHRoYXQgdGhlIHVzZXIgY2Fubm90IGRlbGV0ZSBpdCBieSBjYWxs aW5nCisgICAgLy8gZGVsZXRlVmVydGV4QXJyYXlPRVMgKHN1Y2ggZXJyb3JzIHdpbGwgYmUgY2F0 Y2hlZCBlYXJsaWVyKQorICAgIGlmIChtX3R5cGUgPT0gVHlwZTo6VXNlciB8fCAodmVyc2lvbiA+ PSAzMDApKQogICAgICAgICBjb250ZXh0M2QtPmRlbGV0ZVZlcnRleEFycmF5KG9iamVjdCk7Ci0g ICAgICAgIGJyZWFrOwotICAgIH0KIAogICAgIGlmIChtX2JvdW5kRWxlbWVudEFycmF5QnVmZmVy KQogICAgICAgICBtX2JvdW5kRWxlbWVudEFycmF5QnVmZmVyLT5vbkRldGFjaGVkKGxvY2tlciwg Y29udGV4dDNkKTsK 433573 2021-07-15 03:10:14 -0700 2021-07-15 03:31:20 -0700 Patch bug-96828-20210715130905.patch text/plain 7475 estea U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5OTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGFmMjYzMmRmMTU5ZDcw MDc4YzA0Y2FjYTVkYzczZTY3YWZmODk1NC4uZmE2ZDM2MzkxMTJlZmI4ZWFmZTQxYTIyNzM5YzYx OTdmMmI2ZDNjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTA3LTE1ICBFbGVu aSBNYXJpYSBTdGVhICA8ZXN0ZWFAaWdhbGlhLmNvbT4KKworICAgICAgICBBbHdheXMgdXNlIHRo ZSBkZWZhdWx0IHZlcnRleCBhcnJheSBvYmplY3Qgd2l0aCBPcGVuR0wgPiAzLjAKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2ODI4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gT3BlbkdMIHZlcnNpb25z IDMuMCBhbmQgb24gaXQgaXMgcmVxdWlyZWQgdG8gdXNlIHZlcnRleCBhcnJheXMKKyAgICAgICAg Zm9yIHJlbmRlcmluZy4gVGhlcmVmb3JlLCB3aGVuIHVzZXIgY2FsbHMgZ2xCaW5kVmVydGV4QXJy YXkoMCkgb3IKKyAgICAgICAgZ2wuQmluZFZlcnRleEFycmF5KG51bGwpIGZyb20gV2ViR0wsIHdl IGNhbid0IHNpbXBseSBiaW5kIHRoZSAwCisgICAgICAgIChpbnZhbGlkKSBvYmplY3QuIFdlIG5l ZWQgdG8gaGF2ZSBhIGRlZmF1bHQgb2JqZWN0IGFuZCBiaW5kIGl0IHNvCisgICAgICAgIHNvIHRo YXQgZm9sbG93IHVwIGNhbGxzIHRvIGdsRHJhd0FycmF5cy9nbERyYXdFbGVtZW50cyBldGMgY2Fu CisgICAgICAgIHN0aWxsIHdvcmsuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBpdCBmaXhlcyB0 aGUgRHJhd1Rlc3RzIG9mCisgICAgICAgIExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL29l cy12ZXJ0ZXgtYXJyYXktb2JqZWN0Lmh0bWwKKworICAgICAgICAqIGh0bWwvY2FudmFzL09FU1Zl cnRleEFycmF5T2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok9FU1ZlcnRleEFycmF5T2Jq ZWN0OjpkZWxldGVWZXJ0ZXhBcnJheU9FUyk6CisgICAgICAgIChXZWJDb3JlOjpPRVNWZXJ0ZXhB cnJheU9iamVjdDo6YmluZFZlcnRleEFycmF5T0VTKToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9X ZWJHTE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTE9iamVjdDo6ZGVsZXRlT2Jq ZWN0KToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFZlcnRleEFycmF5T2JqZWN0T0VTLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMVmVydGV4QXJyYXlPYmplY3RPRVM6OldlYkdMVmVy dGV4QXJyYXlPYmplY3RPRVMpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xWZXJ0ZXhBcnJheU9i amVjdE9FUzo6ZGVsZXRlT2JqZWN0SW1wbCk6CisKIDIwMjEtMDctMTQgIEFsZXggQ2hyaXN0ZW5z ZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBMaW5rIGFnYWluc3QgQ2F0 YWx5c3QgQU5HTEUtc2hhcmVkLmR5bGliIHdoZW4gbGlua2luZyBDYXRhbHlzdCBXZWJDb3JlLmZy YW1ld29yawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvU291cmNlc0NvY29hLnR4dCBiL1Nv dXJjZS9XZWJDb3JlL1NvdXJjZXNDb2NvYS50eHQKaW5kZXggNjgyZGJjYzA2Y2VhZTdkNzZjMWUw ZTlhNjZhYmY0MjdlMWNjYjQ5Yi4uNGExMzY1ODIzYTUzMzViZjgxMTMwYTFjYjJlZWE4YWQwN2Nm ZmYxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvU291cmNlc0NvY29hLnR4dAorKysgYi9T b3VyY2UvV2ViQ29yZS9Tb3VyY2VzQ29jb2EudHh0CkBAIC0yODEsNiArMjgxLDcgQEAgcGxhdGZv cm0vZ2FtZXBhZC9tYWMvSElER2FtZXBhZFByb3ZpZGVyLm1tCiBwbGF0Zm9ybS9nYW1lcGFkL21h Yy9Mb2dpdGVjaEdhbWVwYWQuY3BwCiBwbGF0Zm9ybS9nYW1lcGFkL21hYy9NdWx0aUdhbWVwYWRQ cm92aWRlci5tbQogcGxhdGZvcm0vZ2FtZXBhZC9tYWMvU3RhZGlhSElER2FtZXBhZC5jcHAKK3Bs YXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5jcHAgQG5vLXVuaWZ5CiBwbGF0Zm9ybS9ncmFwaGlj cy9NZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyLmNwcAogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL0FWVHJhY2tQcml2YXRlQVZGT2JqQ0ltcGwubW0gQG5vLXVuaWZ5CiBwbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vQXVkaW9Tb3VyY2VQcm92aWRlckFWRk9iakMubW0gQG5vLXVu aWZ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9PRVNWZXJ0ZXhBcnJh eU9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9PRVNWZXJ0ZXhBcnJheU9i amVjdC5jcHAKaW5kZXggMzBkNGIzZmYwY2JkMjRmNTM4MDg2MzBiY2M0MzA2N2Q4Y2U4ZjA2ZC4u NTJmOTZmZDEwODQ2MDI4ODIxOTYwNDA1N2Q1ZTYzMDAwNTFkYmU2MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvT0VTVmVydGV4QXJyYXlPYmplY3QuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL09FU1ZlcnRleEFycmF5T2JqZWN0LmNwcApAQCAtNjUs NyArNjUsMTEgQEAgdm9pZCBPRVNWZXJ0ZXhBcnJheU9iamVjdDo6ZGVsZXRlVmVydGV4QXJyYXlP RVMoV2ViR0xWZXJ0ZXhBcnJheU9iamVjdE9FUyogYXJyYXkKIAogICAgIExvY2tlciBsb2NrZXIg eyBtX2NvbnRleHQtPm9iamVjdEdyYXBoTG9jaygpIH07CiAKLSAgICBpZiAoIWFycmF5T2JqZWN0 IHx8IG1fY29udGV4dC0+aXNDb250ZXh0TG9zdCgpKQorICAgIC8vIHdlIHNob3VsZG4ndCBsZXQg dGhlIHVzZXIgZGVsZXRlIHRoZSBkZWZhdWx0IG9iamVjdCwKKyAgICAvLyBmcm9tIE9FU192ZXJ0 ZXhfYXJyYXlfb2JqZWN0L2dsRGVsZXRlVmVydGV4QXJyYXlzT0VTOgorICAgIC8vIFVudXNlZCBu YW1lcyBpbiA8YXJyYXlzPiBhcmUgc2lsZW50bHkgaWdub3JlZCwgYXMgaWYgdGhleSBoYXZlCisg ICAgLy8gdGhlIHZhbHVlIHplcm8uCisgICAgaWYgKCFhcnJheU9iamVjdCB8fCBtX2NvbnRleHQt PmlzQ29udGV4dExvc3QoKSB8fCBhcnJheU9iamVjdC0+aXNEZWZhdWx0T2JqZWN0KCkpCiAgICAg ICAgIHJldHVybjsKIAogICAgIGlmICghYXJyYXlPYmplY3QtPmlzRGVmYXVsdE9iamVjdCgpICYm IGFycmF5T2JqZWN0ID09IHN0YXRpY19jYXN0PFdlYkdMUmVuZGVyaW5nQ29udGV4dCo+KG1fY29u dGV4dCktPm1fYm91bmRWZXJ0ZXhBcnJheU9iamVjdCkKQEAgLTEwMCwxMyArMTA0LDE1IEBAIHZv aWQgT0VTVmVydGV4QXJyYXlPYmplY3Q6OmJpbmRWZXJ0ZXhBcnJheU9FUyhXZWJHTFZlcnRleEFy cmF5T2JqZWN0T0VTKiBhcnJheU9iCiAKICAgICBhdXRvKiBjb250ZXh0R0wgPSBtX2NvbnRleHQt PmdyYXBoaWNzQ29udGV4dEdMKCk7CiAgICAgYXV0byYgY29udGV4dCA9IGRvd25jYXN0PFdlYkdM UmVuZGVyaW5nQ29udGV4dD4oKm1fY29udGV4dCk7Ci0gICAgaWYgKGFycmF5T2JqZWN0ICYmICFh cnJheU9iamVjdC0+aXNEZWZhdWx0T2JqZWN0KCkgJiYgYXJyYXlPYmplY3QtPm9iamVjdCgpKSB7 CisKKyAgICBpZiAoYXJyYXlPYmplY3QgJiYgYXJyYXlPYmplY3QtPm9iamVjdCgpKSB7CiAgICAg ICAgIGNvbnRleHRHTC0+YmluZFZlcnRleEFycmF5KGFycmF5T2JqZWN0LT5vYmplY3QoKSk7CiAg ICAgICAgIGFycmF5T2JqZWN0LT5zZXRIYXNFdmVyQmVlbkJvdW5kKCk7CiAgICAgICAgIGNvbnRl eHQuc2V0Qm91bmRWZXJ0ZXhBcnJheU9iamVjdChsb2NrZXIsIGFycmF5T2JqZWN0KTsKICAgICB9 IGVsc2UgewotICAgICAgICBjb250ZXh0R0wtPmJpbmRWZXJ0ZXhBcnJheSgwKTsKLSAgICAgICAg Y29udGV4dC5zZXRCb3VuZFZlcnRleEFycmF5T2JqZWN0KGxvY2tlciwgbnVsbHB0cik7CisgICAg ICAgIGNvbnRleHQubV9kZWZhdWx0VmVydGV4QXJyYXlPYmplY3QtPnNldEhhc0V2ZXJCZWVuQm91 bmQoKTsKKyAgICAgICAgY29udGV4dEdMLT5iaW5kVmVydGV4QXJyYXkoY29udGV4dC5tX2RlZmF1 bHRWZXJ0ZXhBcnJheU9iamVjdC0+b2JqZWN0KCkpOworICAgICAgICBjb250ZXh0LnNldEJvdW5k VmVydGV4QXJyYXlPYmplY3QobG9ja2VyLCBjb250ZXh0Lm1fZGVmYXVsdFZlcnRleEFycmF5T2Jq ZWN0LmdldCgpKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv Y2FudmFzL1dlYkdMT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdM T2JqZWN0LmNwcAppbmRleCBmMjgwODAzMzYxYmVjNjAyOWIyMGRjY2FmMDgxMjMwOGExMjJjZDhh Li5kYzU3YzY4NDViNDllNzI4MTYwYjE3ZjQxOGViZTZmMmRmMGFkNzIwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9jYW52YXMvV2ViR0xPYmplY3QuY3BwCkBAIC03MywxMCArNzMsOSBAQCB2b2lk IFdlYkdMT2JqZWN0OjpkZWxldGVPYmplY3QoY29uc3QgQWJzdHJhY3RMb2NrZXImIGxvY2tlciwg R3JhcGhpY3NDb250ZXh0R0wqCiAKICAgICAgICAgaWYgKGNvbnRleHQzZCkKICAgICAgICAgICAg IGRlbGV0ZU9iamVjdEltcGwobG9ja2VyLCBjb250ZXh0M2QsIG1fb2JqZWN0KTsKLSAgICB9CiAK LSAgICBpZiAoIW1fYXR0YWNobWVudENvdW50KQogICAgICAgICBtX29iamVjdCA9IDA7CisgICAg fQogfQogCiB2b2lkIFdlYkdMT2JqZWN0OjpkZXRhY2goKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaHRtbC9jYW52YXMvV2ViR0xWZXJ0ZXhBcnJheU9iamVjdE9FUy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFZlcnRleEFycmF5T2JqZWN0T0VTLmNwcAppbmRleCAx MTBjYzc3NWE0ZmQ3OGVhMzI5MzRhNTYwMWI0OTViMmQ5ZTBkNWYyLi5lMWVkMjYwOWRmNjBjOTVh MDM4OTBmNWRkMmM1ZWZjYjAwM2U3NDVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L2NhbnZhcy9XZWJHTFZlcnRleEFycmF5T2JqZWN0T0VTLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL2NhbnZhcy9XZWJHTFZlcnRleEFycmF5T2JqZWN0T0VTLmNwcApAQCAtMzAsNiArMzAs NyBAQAogI2luY2x1ZGUgIldlYkdMVmVydGV4QXJyYXlPYmplY3RPRVMuaCIKIAogI2luY2x1ZGUg IkV4dGVuc2lvbnNHTC5oIgorI2luY2x1ZGUgIkdMQ29udGV4dC5oIgogI2luY2x1ZGUgIldlYkdM UmVuZGVyaW5nQ29udGV4dEJhc2UuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNDIsMTMg KzQzLDE5IEBAIFJlZjxXZWJHTFZlcnRleEFycmF5T2JqZWN0T0VTPiBXZWJHTFZlcnRleEFycmF5 T2JqZWN0T0VTOjpjcmVhdGUoV2ViR0xSZW5kZXJpbmdDCiBXZWJHTFZlcnRleEFycmF5T2JqZWN0 T0VTOjpXZWJHTFZlcnRleEFycmF5T2JqZWN0T0VTKFdlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2Um IGNvbnRleHQsIFR5cGUgdHlwZSkKICAgICA6IFdlYkdMVmVydGV4QXJyYXlPYmplY3RCYXNlKGNv bnRleHQsIHR5cGUpCiB7Ci0gICAgc3dpdGNoICh0eXBlKSB7Ci0gICAgY2FzZSBUeXBlOjpEZWZh dWx0OgotICAgICAgICBicmVhazsKLSAgICBjYXNlIFR5cGU6OlVzZXI6CisgICAgdWludDY0X3Qg dmVyc2lvbiA9IEdMQ29udGV4dDo6Y3VycmVudCgpLT52ZXJzaW9uKCk7CisgICAgLy8gT3BlbkdM IDMuMCBhbmQgb24gcmVxdWlyZSBWQU9zIGZvciByZW5kZXJpbmcgb2JqZWN0cy4gQWNjb3JkaW5n IHRvCisgICAgLy8gc2VjdGlvbiAyLjEwIG9mIHRoZSBPcGVuR0wgcmVmZXJlbmNlICh0aXRsZTog IlZlcnRleCBBcnJheSBPYmplY3RzIikKKyAgICAvLyBmb3IgZ2xEZWxldGVWZXJ0ZXhBcnJheXM6 CisgICAgLy8gSWYgYSB2ZXJ0ZXggYXJyYXkgb2JqZWN0IHRoYXQgaXMgY3VycmVudGx5IGJvdW5k IGlzIGRlbGV0ZWQsIHRoZQorICAgIC8vIGJpbmRpbmcgZm9yIHRoYXQgb2JqZWN0IHJldmVydHMg dG8gemVybyBhbmQgdGhlIGRlZmF1bHQgdmVydGV4IGFycmF5CisgICAgLy8gYmVjb21lcyBjdXJy ZW50LiBVbnVzZWQgbmFtZXMgaW4gYXJyYXlzIGFyZSBzaWxlbnRseSBpZ25vcmVkLCBhcyBpcyB0 aGUKKyAgICAvLyB2YWx1ZSB6ZXJvLgorICAgIC8vIFRoaXMgcGFyYWdyYXBoIGltcGxpZXMgdGhh dDogd2UgbmVlZCB0byAqYWx3YXlzKiBjcmVhdGUgYSBkZWZhdWx0IFZBTy4KKyAgICAvLyBDcmVh dGluZyB0aGUgZGVmYXVsdCBvYmplY3QgaXMgYWxzbyByZXF1aXJlZCBzbyB0aGF0IHdlIGNhbiBz dGlsbCByZW5kZXIKKyAgICAvLyB3aGVuIHdlIGNhbGwgZ2wuYmluZFZlcnRleEFycmF5KG51bGwp IGluIFdlYkdMLiAoTWFrZXMgdmFvIHRlc3RzIHBhc3MpCisgICAgaWYgKHR5cGUgPT0gVHlwZTo6 VXNlciB8fCAodmVyc2lvbiA+PSAzMDApKQogICAgICAgICBzZXRPYmplY3QodGhpcy0+Y29udGV4 dCgpLT5ncmFwaGljc0NvbnRleHRHTCgpLT5jcmVhdGVWZXJ0ZXhBcnJheSgpKTsKLSAgICAgICAg YnJlYWs7Ci0gICAgfQogfQogCiBXZWJHTFZlcnRleEFycmF5T2JqZWN0T0VTOjp+V2ViR0xWZXJ0 ZXhBcnJheU9iamVjdE9FUygpCkBAIC02MSwxMyArNjgsMTQgQEAgV2ViR0xWZXJ0ZXhBcnJheU9i amVjdE9FUzo6fldlYkdMVmVydGV4QXJyYXlPYmplY3RPRVMoKQogCiB2b2lkIFdlYkdMVmVydGV4 QXJyYXlPYmplY3RPRVM6OmRlbGV0ZU9iamVjdEltcGwoY29uc3QgV1RGOjpBYnN0cmFjdExvY2tl ciYgbG9ja2VyLCBHcmFwaGljc0NvbnRleHRHTCogY29udGV4dDNkLCBQbGF0Zm9ybUdMT2JqZWN0 IG9iamVjdCkKIHsKLSAgICBzd2l0Y2ggKG1fdHlwZSkgewotICAgIGNhc2UgVHlwZTo6RGVmYXVs dDoKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBUeXBlOjpVc2VyOgorICAgIHVpbnQ2NF90IHZl cnNpb24gPSBHTENvbnRleHQ6OmN1cnJlbnQoKS0+dmVyc2lvbigpOworICAgIC8vIFNlZSBhbHNv OiB0aGUgY29uc3RydWN0b3IgYWJvdmUuCisgICAgLy8gVGhpcyBmdW5jdGlvbiBpcyBjYWxsZWQg d2hlbiB0aGUgdmFvIGRlc3RydWN0b3IgaXMgY2FsbGVkLgorICAgIC8vIFdlIGNhbiBhbHNvIHVz ZSBpdCB0byBkZWxldGUgdGhlIGRlZmF1bHQgdmVydGV4IGFycmF5IGFzIHdlCisgICAgLy8gYWxy ZWFkeSBtYWRlIHN1cmUgdGhhdCB0aGUgdXNlciBjYW5ub3QgZGVsZXRlIGl0IGJ5IGNhbGxpbmcK KyAgICAvLyBkZWxldGVWZXJ0ZXhBcnJheU9FUyAoc3VjaCBlcnJvcnMgd2lsbCBiZSBjYXRjaGVk IGVhcmxpZXIpCisgICAgaWYgKG1fdHlwZSA9PSBUeXBlOjpVc2VyIHx8ICh2ZXJzaW9uID49IDMw MCkpCiAgICAgICAgIGNvbnRleHQzZC0+ZGVsZXRlVmVydGV4QXJyYXkob2JqZWN0KTsKLSAgICAg ICAgYnJlYWs7Ci0gICAgfQogCiAgICAgaWYgKG1fYm91bmRFbGVtZW50QXJyYXlCdWZmZXIpCiAg ICAgICAgIG1fYm91bmRFbGVtZW50QXJyYXlCdWZmZXItPm9uRGV0YWNoZWQobG9ja2VyLCBjb250 ZXh0M2QpOwo=