126832 2014-01-11 19:54:02 -0800 [WebGL] Error messages for attributes, uniforms, and varyings should use source code symbols, not internal mangled symbols 2014-01-13 10:17:51 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 121849 126871 1 bfulgham bfulgham bfulgham commit-queue dino eflews.bot gyuyoung.kim kondapallykalyan noam rego+ews roger_fong webkit-bug-importer xan.lopez oldest_to_newest 966881 0 bfulgham 2014-01-11 19:54:02 -0800 While working on another bug, I noticed that the error messages we generate for linker errors for our shaders reports the mapped symbol name (i.e., the mangled ANGLE name). We should use the actual variable name from the source file when reporting a problem to the user. Instead of this: [Log] *** Error linking program '[object WebGLProgram]':ERROR: Input of fragment shader 'webgl_a78e73e400000001' not written by vertex shader (glsl-conformance-test.js, line 44) We should report: [Log] *** Error linking program '[object WebGLProgram]':ERROR: Input of fragment shader 'v_varying' not written by vertex shader (glsl-conformance-test.js, line 44) 966882 1 webkit-bug-importer 2014-01-11 19:54:31 -0800 <rdar://problem/15800348> 966910 2 bfulgham 2014-01-11 22:11:39 -0800 While working on this issue I discovered that we were not building a symbol table for varyings, and that the encoder would crash when asked to process a varying because of a missing 'break'. 966920 3 220961 bfulgham 2014-01-11 23:32:47 -0800 Created attachment 220961 Patch 966921 4 commit-queue 2014-01-11 23:34:16 -0800 Attachment 220961 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/fast/canvas/webgl/glsl-conformance-expected.txt', u'LayoutTests/fast/canvas/webgl/glsl-conformance.html', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp', u'Source/WebCore/platform/graphics/GraphicsContext3D.h', u'Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp', '--commit-queue']" exit_code: 1 ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:1347: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:1349: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:1347: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:1349: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] Total errors found: 4 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 966922 5 220961 eflews.bot 2014-01-11 23:38:28 -0800 Comment on attachment 220961 Patch Attachment 220961 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/6046675881689088 966923 6 bfulgham 2014-01-11 23:47:32 -0800 This bug was introduced by http://trac.webkit.org/changeset/156352, when we turned on the ANGLE name mangling. 966925 7 220963 bfulgham 2014-01-11 23:51:12 -0800 Created attachment 220963 Revised to help EFL/GTK to build properly 966926 8 commit-queue 2014-01-11 23:54:22 -0800 Attachment 220963 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/fast/canvas/webgl/glsl-conformance-expected.txt', u'LayoutTests/fast/canvas/webgl/glsl-conformance.html', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp', u'Source/WebCore/platform/graphics/GraphicsContext3D.h', u'Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp', '--commit-queue']" exit_code: 1 ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:1347: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:1349: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:1347: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:1349: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] Total errors found: 4 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 966947 9 220963 eflews.bot 2014-01-12 05:44:56 -0800 Comment on attachment 220963 Revised to help EFL/GTK to build properly Attachment 220963 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/6202724660019200 967022 10 220963 dino 2014-01-12 13:34:12 -0800 Comment on attachment 220963 Revised to help EFL/GTK to build properly View in context: https://bugs.webkit.org/attachment.cgi?id=220963&action=review > Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp:63 > case SH_VARYINGS: > symbolMaxNameLengthType = SH_VARYING_MAX_LENGTH; > + break; Ouch! :) 967092 11 bfulgham 2014-01-12 17:19:53 -0800 (In reply to comment #9) > (From update of attachment 220963 [details]) > Attachment 220963 [details] did not pass efl-wk2-ews (efl-wk2): > Output: http://webkit-queues.appspot.com/results/6202724660019200 The error is not related to this patch: [ 19%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSOESElementIndexUint.cpp.o c++: internal compiler error: Killed (program cc1plus) Please submit a full bug report, 967093 12 bfulgham 2014-01-12 17:22:13 -0800 Committed r161843: <http://trac.webkit.org/changeset/161843> 967158 13 commit-queue 2014-01-12 22:21:48 -0800 Re-opened since this is blocked by bug 126871 967388 14 bfulgham 2014-01-13 10:17:51 -0800 Committed r161889: <http://trac.webkit.org/changeset/161889> 220961 2014-01-11 23:32:47 -0800 2014-01-11 23:51:09 -0800 Patch bug-126832-20140111233246.patch text/plain 11298 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MTgwMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE0LTAxLTExICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJHTF0gRXJyb3IgbWVz c2FnZXMgc2hvdWxkIHVzZSBzb3VyY2UgY29kZSBsYWJlbHMsIG5vdCBpbnRlcm5hbCBtYW5nbGVk IHN5bWJvbHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMjY4MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBSZXZpc2VkIGZhc3QvY2FudmFzL3dlYmdsL2dsc2wtY29uZm9ybWFuY2UuaHRtbC4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0FOR0xFV2ViS2l0QnJpZGdlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmdldFN5bWJvbEluZm8pOiBDb3JyZWN0IG1pc3NpbmcgJ2JyZWFrJy4KKyAgICAg ICAgKFdlYkNvcmU6OkFOR0xFV2ViS2l0QnJpZGdlOjpjb21waWxlU2hhZGVyU291cmNlKTogQ2Fs bCAnZ2V0U3ltYm9sSW5mbycKKyAgICAgICAgZm9yIFNIX1ZBUllJTkdTLgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmg6IEFkZCBuZXcgZGVjbGFyYXRpb25z LgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9w ZW5HTENvbW1vbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6Y29t cGlsZVNoYWRlcik6IERlbWFuZ2xlIGxvZyBvdXRwdXQuCisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0NvbnRleHQzRDo6bWFwcGVkU3ltYm9sTmFtZSk6IEFkZGVkLgorICAgICAgICAoV2ViQ29y ZTo6R3JhcGhpY3NDb250ZXh0M0Q6OmdldFVubWFuZ2xlZEluZm9Mb2cpOiBBZGRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpnZXRQcm9ncmFtSW5mb0xvZyk6IERlbWFu Z2xlIGxvZyBvdXRwdXQuCisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6Z2V0 U2hhZGVySW5mb0xvZyk6IERlbWFuZ2xlIGxvZyBvdXRwdXQuCisKIDIwMTQtMDEtMTEgIERhdmlk IEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBEbyBub3QgbGlu ayB0byBBcHBsaWNhdGlvblNlcnZpY2VzLmZyYW1ld29yayBmb3IgaU9TCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9BTkdMRVdlYktpdEJyaWRnZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQU5HTEVXZWJLaXRCcmlkZ2Uu Y3BwCShyZXZpc2lvbiAxNjE3ODgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9BTkdMRVdlYktpdEJyaWRnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYwLDYgKzYwLDcgQEAg c3RhdGljIGJvb2wgZ2V0U3ltYm9sSW5mbyhTaEhhbmRsZSBjb21waQogICAgICAgICBicmVhazsK ICAgICBjYXNlIFNIX1ZBUllJTkdTOgogICAgICAgICBzeW1ib2xNYXhOYW1lTGVuZ3RoVHlwZSA9 IFNIX1ZBUllJTkdfTUFYX0xFTkdUSDsKKyAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTIy Nyw2ICsyMjgsOCBAQCBib29sIEFOR0xFV2ViS2l0QnJpZGdlOjpjb21waWxlU2hhZGVyU291CiAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIWdldFN5bWJvbEluZm8oY29tcGlsZXIsIFNI X0FDVElWRV9VTklGT1JNUywgc3ltYm9scykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBp ZiAoIWdldFN5bWJvbEluZm8oY29tcGlsZXIsIFNIX1ZBUllJTkdTLCBzeW1ib2xzKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIHRydWU7CiB9CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmgJKHJl dmlzaW9uIDE2MTc4OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBo aWNzQ29udGV4dDNELmgJKHdvcmtpbmcgY29weSkKQEAgLTczOSw2ICs3MzksNyBAQCBwdWJsaWM6 CiAgICAgdm9pZCBnZXRQcm9ncmFtaXYoUGxhdGZvcm0zRE9iamVjdCBwcm9ncmFtLCBHQzNEZW51 bSBwbmFtZSwgR0MzRGludCogdmFsdWUpOwogICAgIHZvaWQgZ2V0Tm9uQnVpbHRJbkFjdGl2ZVN5 bWJvbENvdW50KFBsYXRmb3JtM0RPYmplY3QgcHJvZ3JhbSwgR0MzRGVudW0gcG5hbWUsIEdDM0Rp bnQqIHZhbHVlKTsKICAgICBTdHJpbmcgZ2V0UHJvZ3JhbUluZm9Mb2coUGxhdGZvcm0zRE9iamVj dCk7CisgICAgU3RyaW5nIGdldFVubWFuZ2xlZEluZm9Mb2coUGxhdGZvcm0zRE9iamVjdFsyXSwg R0MzRHNpemVpLCBjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIGdldFJlbmRlcmJ1ZmZlclBhcmFt ZXRlcml2KEdDM0RlbnVtIHRhcmdldCwgR0MzRGVudW0gcG5hbWUsIEdDM0RpbnQqIHZhbHVlKTsK ICAgICB2b2lkIGdldFNoYWRlcml2KFBsYXRmb3JtM0RPYmplY3QsIEdDM0RlbnVtIHBuYW1lLCBH QzNEaW50KiB2YWx1ZSk7CiAgICAgU3RyaW5nIGdldFNoYWRlckluZm9Mb2coUGxhdGZvcm0zRE9i amVjdCk7CkBAIC0xMDg0LDYgKzEwODUsNyBAQCBwcml2YXRlOgogICAgIHN0ZDo6dW5pcXVlX3B0 cjxBY3RpdmVTaGFkZXJTeW1ib2xDb3VudHM+IG1fc2hhZGVyU3ltYm9sQ291bnQ7CiAKICAgICBT dHJpbmcgbWFwcGVkU3ltYm9sTmFtZShQbGF0Zm9ybTNET2JqZWN0IHByb2dyYW0sIEFOR0xFU2hh ZGVyU3ltYm9sVHlwZSwgY29uc3QgU3RyaW5nJiBuYW1lKTsKKyAgICBTdHJpbmcgbWFwcGVkU3lt Ym9sTmFtZShQbGF0Zm9ybTNET2JqZWN0IHNoYWRlcnNbMl0sIHNpemVfdCBjb3VudCwgY29uc3Qg U3RyaW5nJiBuYW1lKTsKICAgICBTdHJpbmcgb3JpZ2luYWxTeW1ib2xOYW1lKFBsYXRmb3JtM0RP YmplY3QgcHJvZ3JhbSwgQU5HTEVTaGFkZXJTeW1ib2xUeXBlLCBjb25zdCBTdHJpbmcmIG5hbWUp OwogCiAgICAgQU5HTEVXZWJLaXRCcmlkZ2UgbV9jb21waWxlcjsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1v bi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3Bl bmdsL0dyYXBoaWNzQ29udGV4dDNET3BlbkdMQ29tbW9uLmNwcAkocmV2aXNpb24gMTYxNzg4KQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4 dDNET3BlbkdMQ29tbW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDcsNiArNDcsNyBAQAogI2lu Y2x1ZGUgIkludFNpemUuaCIKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiTm90SW1w bGVtZW50ZWQuaCIKKyNpbmNsdWRlICJSZWd1bGFyRXhwcmVzc2lvbi5oIgogI2luY2x1ZGUgIlRl bXBvcmFyeU9wZW5HTFNldHRpbmcuaCIKICNpbmNsdWRlIDxjc3RyaW5nPgogI2luY2x1ZGUgPHJ1 bnRpbWUvQXJyYXlCdWZmZXIuaD4KQEAgLTU0Niw3ICs1NDcsOCBAQCB2b2lkIEdyYXBoaWNzQ29u dGV4dDNEOjpjb21waWxlU2hhZGVyKFBsCiAgICAgICAgIGF1dG8gaW5mbyA9IHN0ZDo6bWFrZV91 bmlxdWU8R0xjaGFyW10+KGxlbmd0aCk7CiAgICAgICAgIDo6Z2xHZXRTaGFkZXJJbmZvTG9nKHNo YWRlciwgbGVuZ3RoLCAmc2l6ZSwgaW5mby5nZXQoKSk7CiAKLSAgICAgICAgZW50cnkubG9nID0g aW5mby5nZXQoKTsKKyAgICAgICAgUGxhdGZvcm0zRE9iamVjdCBzaGFkZXJzWzJdID0geyBzaGFk ZXIsIDAgfTsKKyAgICAgICAgZW50cnkubG9nID0gZ2V0VW5tYW5nbGVkSW5mb0xvZyhzaGFkZXJz LCAxLCBTdHJpbmcoaW5mby5nZXQoKSkpOwogICAgIH0KIAogICAgIGlmIChHTENvbXBpbGVTdWNj ZXNzICE9IEdMX1RSVUUpIHsKQEAgLTgwNiw2ICs4MDgsMjQgQEAgU3RyaW5nIEdyYXBoaWNzQ29u dGV4dDNEOjpvcmlnaW5hbFN5bWJvbAogICAgIHJldHVybiBuYW1lOwogfQogCitTdHJpbmcgR3Jh cGhpY3NDb250ZXh0M0Q6Om1hcHBlZFN5bWJvbE5hbWUoUGxhdGZvcm0zRE9iamVjdCBzaGFkZXJz WzJdLCBzaXplX3QgY291bnQsIGNvbnN0IFN0cmluZyYgbmFtZSkKK3sKKyAgICBmb3IgKGVudW0g QU5HTEVTaGFkZXJTeW1ib2xUeXBlIHN5bWJvbFR5cGUgPSBTSEFERVJfU1lNQk9MX1RZUEVfQVRU UklCVVRFOyBzeW1ib2xUeXBlIDw9IFNIQURFUl9TWU1CT0xfVFlQRV9WQVJZSU5HOyArK3N5bWJv bFR5cGUpIHsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjb3VudDsgKytpKSB7Cisg ICAgICAgICAgICBTaGFkZXJTb3VyY2VNYXA6Oml0ZXJhdG9yIHJlc3VsdCA9IG1fc2hhZGVyU291 cmNlTWFwLmZpbmQoc2hhZGVyc1tpXSk7CisgICAgICAgICAgICBpZiAocmVzdWx0ID09IG1fc2hh ZGVyU291cmNlTWFwLmVuZCgpKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAg ICAgCisgICAgICAgICAgICBjb25zdCBTaGFkZXJTeW1ib2xNYXAmIHN5bWJvbE1hcCA9IHJlc3Vs dC0+dmFsdWUuc3ltYm9sTWFwKHN5bWJvbFR5cGUpOworICAgICAgICAgICAgZm9yIChjb25zdCBh dXRvJiBzeW1ib2xFbnRyeSA6IHN5bWJvbE1hcCkgeworICAgICAgICAgICAgICAgIGlmIChzeW1i b2xFbnRyeS52YWx1ZS5tYXBwZWROYW1lID09IG5hbWUpCisgICAgICAgICAgICAgICAgICAgIHJl dHVybiBzeW1ib2xFbnRyeS5rZXk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9Cisg ICAgcmV0dXJuIG5hbWU7Cit9CisKIGludCBHcmFwaGljc0NvbnRleHQzRDo6Z2V0QXR0cmliTG9j YXRpb24oUGxhdGZvcm0zRE9iamVjdCBwcm9ncmFtLCBjb25zdCBTdHJpbmcmIG5hbWUpCiB7CiAg ICAgaWYgKCFwcm9ncmFtKQpAQCAtMTI3OCw2ICsxMjk4LDM2IEBAIHZvaWQgR3JhcGhpY3NDb250 ZXh0M0Q6OmdldE5vbkJ1aWx0SW5BY3QKICAgICAqdmFsdWUgPSBtX3NoYWRlclN5bWJvbENvdW50 LT5jb3VudEZvclR5cGUocG5hbWUpOwogfQogCitTdHJpbmcgR3JhcGhpY3NDb250ZXh0M0Q6Omdl dFVubWFuZ2xlZEluZm9Mb2coUGxhdGZvcm0zRE9iamVjdCBzaGFkZXJzWzJdLCBHQzNEc2l6ZWkg Y291bnQsIGNvbnN0IFN0cmluZyYgbG9nKQoreworICAgIExPRyhXZWJHTCwgIldhczogJXMiLCBs b2cudXRmOCgpLmRhdGEoKSk7CisKKyAgICBSZWd1bGFyRXhwcmVzc2lvbiByZWdFeHAoIndlYmds X1swMTIzNDU2Nzg5YWJjZGVmQUJDREVGXSsiLCBUZXh0Q2FzZVNlbnNpdGl2ZSk7CisKKyAgICBT dHJpbmcgcHJvY2Vzc2VkTG9nOworICAgIAorICAgIGludCBzdGFydEZyb20gPSAwOworICAgIGlu dCBtYXRjaGVkTGVuZ3RoID0gMDsKKyAgICBkbyB7CisgICAgICAgIGludCBzdGFydCA9IHJlZ0V4 cC5tYXRjaChsb2csIHN0YXJ0RnJvbSwgJm1hdGNoZWRMZW5ndGgpOworICAgICAgICBpZiAoc3Rh cnQgPT0gLTEpCisgICAgICAgICAgICBicmVhazsKKworICAgICAgICBwcm9jZXNzZWRMb2cuYXBw ZW5kKGxvZy5zdWJzdHJpbmcoc3RhcnRGcm9tLCBzdGFydCAtIHN0YXJ0RnJvbSkpOworICAgICAg ICBzdGFydEZyb20gPSBzdGFydCArIG1hdGNoZWRMZW5ndGg7CisKKyAgICAgICAgY29uc3QgU3Ry aW5nJiBtYW5nbGVkU3ltYm9sID0gbG9nLnN1YnN0cmluZyhzdGFydCwgbWF0Y2hlZExlbmd0aCk7 CisgICAgICAgIGNvbnN0IFN0cmluZyYgbWFwcGVkU3ltYm9sID0gbWFwcGVkU3ltYm9sTmFtZShz aGFkZXJzLCBjb3VudCwgbWFuZ2xlZFN5bWJvbCk7CisgICAgICAgIExPRyhXZWJHTCwgIkRlbWFu Z2xpbmc6ICVzIHRvICVzIiwgbWFuZ2xlZFN5bWJvbC51dGY4KCkuZGF0YSgpLCBtYXBwZWRTeW1i b2wudXRmOCgpLmRhdGEoKSk7CisgICAgICAgIHByb2Nlc3NlZExvZy5hcHBlbmQobWFwcGVkU3lt Ym9sKTsKKyAgICB9IHdoaWxlIChzdGFydEZyb20gPCBzdGF0aWNfY2FzdDxpbnQ+KGxvZy5sZW5n dGgoKSkpOworCisgICAgcHJvY2Vzc2VkTG9nLmFwcGVuZChsb2cuc3Vic3RyaW5nKHN0YXJ0RnJv bSwgbG9nLmxlbmd0aCgpIC0gc3RhcnRGcm9tKSk7CisKKyAgICBMT0coV2ViR0wsICItLT46ICVz IiwgcHJvY2Vzc2VkTG9nLnV0ZjgoKS5kYXRhKCkpOworICAgIHJldHVybiBwcm9jZXNzZWRMb2c7 Cit9CisKIFN0cmluZyBHcmFwaGljc0NvbnRleHQzRDo6Z2V0UHJvZ3JhbUluZm9Mb2coUGxhdGZv cm0zRE9iamVjdCBwcm9ncmFtKQogewogICAgIEFTU0VSVChwcm9ncmFtKTsKQEAgLTEyOTIsNyAr MTM0MiwxMSBAQCBTdHJpbmcgR3JhcGhpY3NDb250ZXh0M0Q6OmdldFByb2dyYW1JbmZvCiAgICAg YXV0byBpbmZvID0gc3RkOjptYWtlX3VuaXF1ZTxHTGNoYXJbXT4obGVuZ3RoKTsKICAgICA6Omds R2V0UHJvZ3JhbUluZm9Mb2cocHJvZ3JhbSwgbGVuZ3RoLCAmc2l6ZSwgaW5mby5nZXQoKSk7CiAK LSAgICByZXR1cm4gU3RyaW5nKGluZm8uZ2V0KCkpOworICAgIEdDM0RzaXplaSBjb3VudDsKKyAg ICBQbGF0Zm9ybTNET2JqZWN0IHNoYWRlcnNbMl07CisgICAgZ2V0QXR0YWNoZWRTaGFkZXJzKHBy b2dyYW0sIDIsICZjb3VudCwgc2hhZGVycyk7CisKKyAgICByZXR1cm4gZ2V0VW5tYW5nbGVkSW5m b0xvZyhzaGFkZXJzLCBjb3VudCwgU3RyaW5nKGluZm8uZ2V0KCkpKTsKIH0KIAogdm9pZCBHcmFw aGljc0NvbnRleHQzRDo6Z2V0UmVuZGVyYnVmZmVyUGFyYW1ldGVyaXYoR0MzRGVudW0gdGFyZ2V0 LCBHQzNEZW51bSBwbmFtZSwgR0MzRGludCogdmFsdWUpCkBAIC0xMzU5LDcgKzE0MTMsOCBAQCBT dHJpbmcgR3JhcGhpY3NDb250ZXh0M0Q6OmdldFNoYWRlckluZm9MCiAgICAgYXV0byBpbmZvID0g c3RkOjptYWtlX3VuaXF1ZTxHTGNoYXJbXT4obGVuZ3RoKTsKICAgICA6OmdsR2V0U2hhZGVySW5m b0xvZyhzaGFkZXIsIGxlbmd0aCwgJnNpemUsIGluZm8uZ2V0KCkpOwogCi0gICAgcmV0dXJuIFN0 cmluZyhpbmZvLmdldCgpKTsKKyAgICBQbGF0Zm9ybTNET2JqZWN0IHNoYWRlcnNbMl0gPSB7IHNo YWRlciwgMCB9OworICAgIHJldHVybiBnZXRVbm1hbmdsZWRJbmZvTG9nKHNoYWRlcnMsIDEsIFN0 cmluZyhpbmZvLmdldCgpKSk7CiB9CiAKIFN0cmluZyBHcmFwaGljc0NvbnRleHQzRDo6Z2V0U2hh ZGVyU291cmNlKFBsYXRmb3JtM0RPYmplY3Qgc2hhZGVyKQpJbmRleDogTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTYx ODAzKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTQgQEAKKzIwMTQtMDEtMTEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisK KyAgICAgICAgW1dlYkdMXSBFcnJvciBtZXNzYWdlcyBzaG91bGQgdXNlIHNvdXJjZSBjb2RlIGxh YmVscywgbm90IGludGVybmFsIG1hbmdsZWQgc3ltYm9scy4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjgzMgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9jYW52YXMvd2ViZ2wvZ2xzbC1jb25m b3JtYW5jZS5odG1sOiBBZGQgbG9nIHRvIHByb2dyYW0gb3V0cHV0CisgICAgICAgIHNob3dpbmcg ZXJyb3IgbWVzc2FnZSB0byBjb25maXJtIHByb3BlciBsYWJlbHMgYXJlIGJlaW5nIHVzZWQuCisg ICAgICAgICogZmFzdC9jYW52YXMvd2ViZ2wvZ2xzbC1jb25mb3JtYW5jZS1leHBlY3RlZC50eHQ6 IHVwZGF0ZWQuCisKIDIwMTQtMDEtMTEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5j b20+CiAKICAgICAgICAgW1dlYkdMXSBDb3JyZWN0IHVuaWZvcm0gaW5wdXQgdmFsaWRhdGlvbiBm b3IgdGV4dHVyZSBzYW1wbGVyIHVuaWZvcm1zCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2NhbnZh cy93ZWJnbC9nbHNsLWNvbmZvcm1hbmNlLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9nbHNsLWNvbmZvcm1hbmNlLWV4cGVjdGVkLnR4dAko cmV2aXNpb24gMTYxNzg4KQorKysgTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvZ2xzbC1j b25mb3JtYW5jZS1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTI4LDYgKzI4LDkgQEAg UEFTUyBbdnNoYWRlcldpdGhJbXBsaWNpdFZlYzNDYXN0L2ZzaGFkZQogUEFTUyBbdnNoYWRlcldp dGhWZXJzaW9uMTMwL2ZzaGFkZXJdOiB2ZXJ0ZXggc2hhZGVyIHVzZXMgdGhlICN2ZXJzaW9uIG5v dCAxMDAgZGlyZWN0aXZlIHNob3VsZCBmYWlsCiBQQVNTIFt2c2hhZGVyV2l0aFZlcnNpb24xMjAv ZnNoYWRlcl06IHZlcnRleCBzaGFkZXIgdXNlcyB0aGUgI3ZlcnNpb24gbm90IDEwMCBkaXJlY3Rp dmUgc2hvdWxkIGZhaWwKIFBBU1MgW3ZzaGFkZXJXaXRoVmVyc2lvbjEwMC9mc2hhZGVyXTogdmVy dGV4IHNoYWRlciB1c2VzIHRoZSAjdmVyc2lvbiAxMDAgZGlyZWN0aXZlIHNob3VsZCBzdWNjZWVk CitQcm9ncmFtIGxpbmsgbG9nOkVSUk9SOiBJbnB1dCBvZiBmcmFnbWVudCBzaGFkZXIgJ3ZfdmFy eWluZycgbm90IHdyaXR0ZW4gYnkgdmVydGV4IHNoYWRlcgorCitQQVNTIFt2c2hhZGVyV2l0aFZl cnNpb24xMDAvZnJhZ21lbnRTaGFkZXJVc2VkVmFyeWluZ106IHZlcnRleCBzaGFkZXIgd2l0aCBu byB2YXJ5aW5nIGFuZCBmcmFnbWVudCBzaGFkZXIgd2l0aCB1c2VkIHZhcnlpbmcgbXVzdCBmYWls CiBQQVNTIFtzaGFkZXJzL2ltcGxpY2l0L2FkZF9pbnRfZmxvYXQudmVydC9mc2hhZGVyXTogaW1w bGljaXQgY2FzdCBhZGRpbmcgaW50ZWdlciB0byBmbG9hdCBzaG91bGQgZmFpbAogUEFTUyBbc2hh ZGVycy9pbXBsaWNpdC9hZGRfaW50X21hdDIudmVydC9mc2hhZGVyXTogaW1wbGljaXQgY2FzdCBh ZGRpbmcgaW50ZWdlciB0byBtYXQyIHNob3VsZCBmYWlsCiBQQVNTIFtzaGFkZXJzL2ltcGxpY2l0 L2FkZF9pbnRfbWF0My52ZXJ0L2ZzaGFkZXJdOiBpbXBsaWNpdCBjYXN0IGFkZGluZyBpbnRlZ2Vy IHRvIG1hdDMgc2hvdWxkIGZhaWwKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmds L2dsc2wtY29uZm9ybWFuY2UuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2Nh bnZhcy93ZWJnbC9nbHNsLWNvbmZvcm1hbmNlLmh0bWwJKHJldmlzaW9uIDE2MTc4OCkKKysrIExh eW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL2dsc2wtY29uZm9ybWFuY2UuaHRtbAkod29ya2lu ZyBjb3B5KQpAQCAtMjExLDYgKzIxMSwxNiBAQCB2b2lkIG1haW4oKQogICAgIGdsX1Bvc2l0aW9u ID0gdlBvc2l0aW9uOwogfQogPC9zY3JpcHQ+Cis8c2NyaXB0IGlkPSJmcmFnbWVudFNoYWRlclVz ZWRWYXJ5aW5nIiB0eXBlPSJ0ZXh0L3NvbWV0aGluZy1ub3QtamF2YXNjcmlwdCI+CitwcmVjaXNp b24gbWVkaXVtcCBmbG9hdDsKKwordmFyeWluZyB2ZWM0IHZfdmFyeWluZzsKKwordm9pZCBtYWlu KCkKK3sKKyAgICBnbF9GcmFnQ29sb3IgPSB2X3Zhcnlpbmc7Cit9Cis8L3NjcmlwdD4KIDxzY3Jp cHQgaWQ9InZzaGFkZXJXaXRoX19GSUxFX18iIHR5cGU9InRleHQvc29tZXRoaW5nLW5vdC1qYXZh c2NyaXB0Ij4KIF9fRklMRV9fCiA8L3NjcmlwdD4KQEAgLTQwMyw2ICs0MTMsMTMgQEAgaWYgKCFn bCkgewogICAgICAgbGlua1N1Y2Nlc3M6IHRydWUsCiAgICAgICBwYXNzTXNnOiAndmVydGV4IHNo YWRlciB1c2VzIHRoZSAjdmVyc2lvbiAxMDAgZGlyZWN0aXZlIHNob3VsZCBzdWNjZWVkJywKICAg ICB9LAorICAgIHsgdlNoYWRlcklkOiAndnNoYWRlcldpdGhWZXJzaW9uMTAwJywKKyAgICAgIHZT aGFkZXJTdWNjZXNzOiB0cnVlLAorICAgICAgZlNoYWRlcklkOiAnZnJhZ21lbnRTaGFkZXJVc2Vk VmFyeWluZycsCisgICAgICBmU2hhZGVyU3VjY2VzczogdHJ1ZSwKKyAgICAgIGxpbmtTdWNjZXNz OiBmYWxzZSwKKyAgICAgIHBhc3NNc2c6ICd2ZXJ0ZXggc2hhZGVyIHdpdGggbm8gdmFyeWluZyBh bmQgZnJhZ21lbnQgc2hhZGVyIHdpdGggdXNlZCB2YXJ5aW5nIG11c3QgZmFpbCcsCisgICAgfSwK ICAgXTsKIAogICAvLyBSZWFkIGluIGFsbCB0aGUgc2hhZGVyIHNvdXJjZS4KQEAgLTQ5OCwxMyAr NTE1LDE3IEBAIGlmICghZ2wpIHsKICAgICAgIGdsLmxpbmtQcm9ncmFtKHByb2dyYW0pOwogICAg ICAgdmFyIGxpbmtlZCA9IChnbC5nZXRQcm9ncmFtUGFyYW1ldGVyKHByb2dyYW0sIGdsLkxJTktf U1RBVFVTKSAhPSAwKTsKICAgICAgIGlmICghbGlua2VkKSB7Ci0gICAgICAgIHZhciBlcnJvciA9 IGdsLmdldFByb2dyYW1JbmZvTG9nKHNoYWRlcik7CisgICAgICAgIHZhciBlcnJvciA9IGdsLmdl dFByb2dyYW1JbmZvTG9nKHByb2dyYW0pOwogICAgICAgICBsb2coIioqKiBFcnJvciBsaW5raW5n IHByb2dyYW0gJyIrcHJvZ3JhbSsiJzoiK2Vycm9yKTsKICAgICAgIH0KICAgICAgIGlmIChsaW5r ZWQgIT0gaW5mby5saW5rU3VjY2VzcykgewogICAgICAgICB0ZXN0RmFpbGVkKHBhc3NNc2cpOwog ICAgICAgICBjb250aW51ZTsKICAgICAgIH0KKyAgICAgIGlmICghaW5mby5saW5rU3VjY2Vzcykg eworICAgICAgICB2YXIgZXJyb3IgPSBnbC5nZXRQcm9ncmFtSW5mb0xvZyhwcm9ncmFtKTsKKyAg ICAgICAgZGVidWcoIlByb2dyYW0gbGluayBsb2c6IiArIGVycm9yKTsKKyAgICAgIH0KICAgICB9 IGVsc2UgewogICAgICAgaWYgKGluZm8ubGlua1N1Y2Nlc3MpIHsKICAgICAgICAgdGVzdEZhaWxl ZChwYXNzTXNnKTsK 220963 2014-01-11 23:51:12 -0800 2014-01-12 13:34:12 -0800 Revised to help EFL/GTK to build properly bug-126832-20140111235111.patch text/plain 11313 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MTgwMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE0LTAxLTExICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJHTF0gRXJyb3IgbWVz c2FnZXMgc2hvdWxkIHVzZSBzb3VyY2UgY29kZSBsYWJlbHMsIG5vdCBpbnRlcm5hbCBtYW5nbGVk IHN5bWJvbHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMjY4MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBSZXZpc2VkIGZhc3QvY2FudmFzL3dlYmdsL2dsc2wtY29uZm9ybWFuY2UuaHRtbC4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0FOR0xFV2ViS2l0QnJpZGdlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmdldFN5bWJvbEluZm8pOiBDb3JyZWN0IG1pc3NpbmcgJ2JyZWFrJy4KKyAgICAg ICAgKFdlYkNvcmU6OkFOR0xFV2ViS2l0QnJpZGdlOjpjb21waWxlU2hhZGVyU291cmNlKTogQ2Fs bCAnZ2V0U3ltYm9sSW5mbycKKyAgICAgICAgZm9yIFNIX1ZBUllJTkdTLgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmg6IEFkZCBuZXcgZGVjbGFyYXRpb25z LgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9w ZW5HTENvbW1vbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6Y29t cGlsZVNoYWRlcik6IERlbWFuZ2xlIGxvZyBvdXRwdXQuCisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0NvbnRleHQzRDo6bWFwcGVkU3ltYm9sTmFtZSk6IEFkZGVkLgorICAgICAgICAoV2ViQ29y ZTo6R3JhcGhpY3NDb250ZXh0M0Q6OmdldFVubWFuZ2xlZEluZm9Mb2cpOiBBZGRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpnZXRQcm9ncmFtSW5mb0xvZyk6IERlbWFu Z2xlIGxvZyBvdXRwdXQuCisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6Z2V0 U2hhZGVySW5mb0xvZyk6IERlbWFuZ2xlIGxvZyBvdXRwdXQuCisKIDIwMTQtMDEtMTEgIERhdmlk IEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBEbyBub3QgbGlu ayB0byBBcHBsaWNhdGlvblNlcnZpY2VzLmZyYW1ld29yayBmb3IgaU9TCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9BTkdMRVdlYktpdEJyaWRnZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQU5HTEVXZWJLaXRCcmlkZ2Uu Y3BwCShyZXZpc2lvbiAxNjE3ODgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9BTkdMRVdlYktpdEJyaWRnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYwLDYgKzYwLDcgQEAg c3RhdGljIGJvb2wgZ2V0U3ltYm9sSW5mbyhTaEhhbmRsZSBjb21waQogICAgICAgICBicmVhazsK ICAgICBjYXNlIFNIX1ZBUllJTkdTOgogICAgICAgICBzeW1ib2xNYXhOYW1lTGVuZ3RoVHlwZSA9 IFNIX1ZBUllJTkdfTUFYX0xFTkdUSDsKKyAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTIy Nyw2ICsyMjgsOCBAQCBib29sIEFOR0xFV2ViS2l0QnJpZGdlOjpjb21waWxlU2hhZGVyU291CiAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIWdldFN5bWJvbEluZm8oY29tcGlsZXIsIFNI X0FDVElWRV9VTklGT1JNUywgc3ltYm9scykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBp ZiAoIWdldFN5bWJvbEluZm8oY29tcGlsZXIsIFNIX1ZBUllJTkdTLCBzeW1ib2xzKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIHRydWU7CiB9CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmgJKHJl dmlzaW9uIDE2MTc4OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBo aWNzQ29udGV4dDNELmgJKHdvcmtpbmcgY29weSkKQEAgLTczOSw2ICs3MzksNyBAQCBwdWJsaWM6 CiAgICAgdm9pZCBnZXRQcm9ncmFtaXYoUGxhdGZvcm0zRE9iamVjdCBwcm9ncmFtLCBHQzNEZW51 bSBwbmFtZSwgR0MzRGludCogdmFsdWUpOwogICAgIHZvaWQgZ2V0Tm9uQnVpbHRJbkFjdGl2ZVN5 bWJvbENvdW50KFBsYXRmb3JtM0RPYmplY3QgcHJvZ3JhbSwgR0MzRGVudW0gcG5hbWUsIEdDM0Rp bnQqIHZhbHVlKTsKICAgICBTdHJpbmcgZ2V0UHJvZ3JhbUluZm9Mb2coUGxhdGZvcm0zRE9iamVj dCk7CisgICAgU3RyaW5nIGdldFVubWFuZ2xlZEluZm9Mb2coUGxhdGZvcm0zRE9iamVjdFsyXSwg R0MzRHNpemVpLCBjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIGdldFJlbmRlcmJ1ZmZlclBhcmFt ZXRlcml2KEdDM0RlbnVtIHRhcmdldCwgR0MzRGVudW0gcG5hbWUsIEdDM0RpbnQqIHZhbHVlKTsK ICAgICB2b2lkIGdldFNoYWRlcml2KFBsYXRmb3JtM0RPYmplY3QsIEdDM0RlbnVtIHBuYW1lLCBH QzNEaW50KiB2YWx1ZSk7CiAgICAgU3RyaW5nIGdldFNoYWRlckluZm9Mb2coUGxhdGZvcm0zRE9i amVjdCk7CkBAIC0xMDg0LDYgKzEwODUsNyBAQCBwcml2YXRlOgogICAgIHN0ZDo6dW5pcXVlX3B0 cjxBY3RpdmVTaGFkZXJTeW1ib2xDb3VudHM+IG1fc2hhZGVyU3ltYm9sQ291bnQ7CiAKICAgICBT dHJpbmcgbWFwcGVkU3ltYm9sTmFtZShQbGF0Zm9ybTNET2JqZWN0IHByb2dyYW0sIEFOR0xFU2hh ZGVyU3ltYm9sVHlwZSwgY29uc3QgU3RyaW5nJiBuYW1lKTsKKyAgICBTdHJpbmcgbWFwcGVkU3lt Ym9sTmFtZShQbGF0Zm9ybTNET2JqZWN0IHNoYWRlcnNbMl0sIHNpemVfdCBjb3VudCwgY29uc3Qg U3RyaW5nJiBuYW1lKTsKICAgICBTdHJpbmcgb3JpZ2luYWxTeW1ib2xOYW1lKFBsYXRmb3JtM0RP YmplY3QgcHJvZ3JhbSwgQU5HTEVTaGFkZXJTeW1ib2xUeXBlLCBjb25zdCBTdHJpbmcmIG5hbWUp OwogCiAgICAgQU5HTEVXZWJLaXRCcmlkZ2UgbV9jb21waWxlcjsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1v bi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3Bl bmdsL0dyYXBoaWNzQ29udGV4dDNET3BlbkdMQ29tbW9uLmNwcAkocmV2aXNpb24gMTYxNzg4KQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4 dDNET3BlbkdMQ29tbW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDcsNiArNDcsNyBAQAogI2lu Y2x1ZGUgIkludFNpemUuaCIKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiTm90SW1w bGVtZW50ZWQuaCIKKyNpbmNsdWRlICJSZWd1bGFyRXhwcmVzc2lvbi5oIgogI2luY2x1ZGUgIlRl bXBvcmFyeU9wZW5HTFNldHRpbmcuaCIKICNpbmNsdWRlIDxjc3RyaW5nPgogI2luY2x1ZGUgPHJ1 bnRpbWUvQXJyYXlCdWZmZXIuaD4KQEAgLTU0Niw3ICs1NDcsOCBAQCB2b2lkIEdyYXBoaWNzQ29u dGV4dDNEOjpjb21waWxlU2hhZGVyKFBsCiAgICAgICAgIGF1dG8gaW5mbyA9IHN0ZDo6bWFrZV91 bmlxdWU8R0xjaGFyW10+KGxlbmd0aCk7CiAgICAgICAgIDo6Z2xHZXRTaGFkZXJJbmZvTG9nKHNo YWRlciwgbGVuZ3RoLCAmc2l6ZSwgaW5mby5nZXQoKSk7CiAKLSAgICAgICAgZW50cnkubG9nID0g aW5mby5nZXQoKTsKKyAgICAgICAgUGxhdGZvcm0zRE9iamVjdCBzaGFkZXJzWzJdID0geyBzaGFk ZXIsIDAgfTsKKyAgICAgICAgZW50cnkubG9nID0gZ2V0VW5tYW5nbGVkSW5mb0xvZyhzaGFkZXJz LCAxLCBTdHJpbmcoaW5mby5nZXQoKSkpOwogICAgIH0KIAogICAgIGlmIChHTENvbXBpbGVTdWNj ZXNzICE9IEdMX1RSVUUpIHsKQEAgLTgwNiw2ICs4MDgsMjQgQEAgU3RyaW5nIEdyYXBoaWNzQ29u dGV4dDNEOjpvcmlnaW5hbFN5bWJvbAogICAgIHJldHVybiBuYW1lOwogfQogCitTdHJpbmcgR3Jh cGhpY3NDb250ZXh0M0Q6Om1hcHBlZFN5bWJvbE5hbWUoUGxhdGZvcm0zRE9iamVjdCBzaGFkZXJz WzJdLCBzaXplX3QgY291bnQsIGNvbnN0IFN0cmluZyYgbmFtZSkKK3sKKyAgICBmb3IgKHNpemVf dCBzeW1ib2xUeXBlID0gMDsgc3ltYm9sVHlwZSA8PSBzdGF0aWNfY2FzdDxzaXplX3Q+KFNIQURF Ul9TWU1CT0xfVFlQRV9WQVJZSU5HKTsgKytzeW1ib2xUeXBlKSB7CisgICAgICAgIGZvciAoc2l6 ZV90IGkgPSAwOyBpIDwgY291bnQ7ICsraSkgeworICAgICAgICAgICAgU2hhZGVyU291cmNlTWFw OjppdGVyYXRvciByZXN1bHQgPSBtX3NoYWRlclNvdXJjZU1hcC5maW5kKHNoYWRlcnNbaV0pOwor ICAgICAgICAgICAgaWYgKHJlc3VsdCA9PSBtX3NoYWRlclNvdXJjZU1hcC5lbmQoKSkKKyAgICAg ICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgY29uc3QgU2hh ZGVyU3ltYm9sTWFwJiBzeW1ib2xNYXAgPSByZXN1bHQtPnZhbHVlLnN5bWJvbE1hcChzdGF0aWNf Y2FzdDxlbnVtIEFOR0xFU2hhZGVyU3ltYm9sVHlwZT4oc3ltYm9sVHlwZSkpOworICAgICAgICAg ICAgZm9yIChjb25zdCBhdXRvJiBzeW1ib2xFbnRyeSA6IHN5bWJvbE1hcCkgeworICAgICAgICAg ICAgICAgIGlmIChzeW1ib2xFbnRyeS52YWx1ZS5tYXBwZWROYW1lID09IG5hbWUpCisgICAgICAg ICAgICAgICAgICAgIHJldHVybiBzeW1ib2xFbnRyeS5rZXk7CisgICAgICAgICAgICB9CisgICAg ICAgIH0KKyAgICB9CisgICAgcmV0dXJuIG5hbWU7Cit9CisKIGludCBHcmFwaGljc0NvbnRleHQz RDo6Z2V0QXR0cmliTG9jYXRpb24oUGxhdGZvcm0zRE9iamVjdCBwcm9ncmFtLCBjb25zdCBTdHJp bmcmIG5hbWUpCiB7CiAgICAgaWYgKCFwcm9ncmFtKQpAQCAtMTI3OCw2ICsxMjk4LDM2IEBAIHZv aWQgR3JhcGhpY3NDb250ZXh0M0Q6OmdldE5vbkJ1aWx0SW5BY3QKICAgICAqdmFsdWUgPSBtX3No YWRlclN5bWJvbENvdW50LT5jb3VudEZvclR5cGUocG5hbWUpOwogfQogCitTdHJpbmcgR3JhcGhp Y3NDb250ZXh0M0Q6OmdldFVubWFuZ2xlZEluZm9Mb2coUGxhdGZvcm0zRE9iamVjdCBzaGFkZXJz WzJdLCBHQzNEc2l6ZWkgY291bnQsIGNvbnN0IFN0cmluZyYgbG9nKQoreworICAgIExPRyhXZWJH TCwgIldhczogJXMiLCBsb2cudXRmOCgpLmRhdGEoKSk7CisKKyAgICBSZWd1bGFyRXhwcmVzc2lv biByZWdFeHAoIndlYmdsX1swMTIzNDU2Nzg5YWJjZGVmQUJDREVGXSsiLCBUZXh0Q2FzZVNlbnNp dGl2ZSk7CisKKyAgICBTdHJpbmcgcHJvY2Vzc2VkTG9nOworICAgIAorICAgIGludCBzdGFydEZy b20gPSAwOworICAgIGludCBtYXRjaGVkTGVuZ3RoID0gMDsKKyAgICBkbyB7CisgICAgICAgIGlu dCBzdGFydCA9IHJlZ0V4cC5tYXRjaChsb2csIHN0YXJ0RnJvbSwgJm1hdGNoZWRMZW5ndGgpOwor ICAgICAgICBpZiAoc3RhcnQgPT0gLTEpCisgICAgICAgICAgICBicmVhazsKKworICAgICAgICBw cm9jZXNzZWRMb2cuYXBwZW5kKGxvZy5zdWJzdHJpbmcoc3RhcnRGcm9tLCBzdGFydCAtIHN0YXJ0 RnJvbSkpOworICAgICAgICBzdGFydEZyb20gPSBzdGFydCArIG1hdGNoZWRMZW5ndGg7CisKKyAg ICAgICAgY29uc3QgU3RyaW5nJiBtYW5nbGVkU3ltYm9sID0gbG9nLnN1YnN0cmluZyhzdGFydCwg bWF0Y2hlZExlbmd0aCk7CisgICAgICAgIGNvbnN0IFN0cmluZyYgbWFwcGVkU3ltYm9sID0gbWFw cGVkU3ltYm9sTmFtZShzaGFkZXJzLCBjb3VudCwgbWFuZ2xlZFN5bWJvbCk7CisgICAgICAgIExP RyhXZWJHTCwgIkRlbWFuZ2xpbmc6ICVzIHRvICVzIiwgbWFuZ2xlZFN5bWJvbC51dGY4KCkuZGF0 YSgpLCBtYXBwZWRTeW1ib2wudXRmOCgpLmRhdGEoKSk7CisgICAgICAgIHByb2Nlc3NlZExvZy5h cHBlbmQobWFwcGVkU3ltYm9sKTsKKyAgICB9IHdoaWxlIChzdGFydEZyb20gPCBzdGF0aWNfY2Fz dDxpbnQ+KGxvZy5sZW5ndGgoKSkpOworCisgICAgcHJvY2Vzc2VkTG9nLmFwcGVuZChsb2cuc3Vi c3RyaW5nKHN0YXJ0RnJvbSwgbG9nLmxlbmd0aCgpIC0gc3RhcnRGcm9tKSk7CisKKyAgICBMT0co V2ViR0wsICItLT46ICVzIiwgcHJvY2Vzc2VkTG9nLnV0ZjgoKS5kYXRhKCkpOworICAgIHJldHVy biBwcm9jZXNzZWRMb2c7Cit9CisKIFN0cmluZyBHcmFwaGljc0NvbnRleHQzRDo6Z2V0UHJvZ3Jh bUluZm9Mb2coUGxhdGZvcm0zRE9iamVjdCBwcm9ncmFtKQogewogICAgIEFTU0VSVChwcm9ncmFt KTsKQEAgLTEyOTIsNyArMTM0MiwxMSBAQCBTdHJpbmcgR3JhcGhpY3NDb250ZXh0M0Q6OmdldFBy b2dyYW1JbmZvCiAgICAgYXV0byBpbmZvID0gc3RkOjptYWtlX3VuaXF1ZTxHTGNoYXJbXT4obGVu Z3RoKTsKICAgICA6OmdsR2V0UHJvZ3JhbUluZm9Mb2cocHJvZ3JhbSwgbGVuZ3RoLCAmc2l6ZSwg aW5mby5nZXQoKSk7CiAKLSAgICByZXR1cm4gU3RyaW5nKGluZm8uZ2V0KCkpOworICAgIEdDM0Rz aXplaSBjb3VudDsKKyAgICBQbGF0Zm9ybTNET2JqZWN0IHNoYWRlcnNbMl07CisgICAgZ2V0QXR0 YWNoZWRTaGFkZXJzKHByb2dyYW0sIDIsICZjb3VudCwgc2hhZGVycyk7CisKKyAgICByZXR1cm4g Z2V0VW5tYW5nbGVkSW5mb0xvZyhzaGFkZXJzLCBjb3VudCwgU3RyaW5nKGluZm8uZ2V0KCkpKTsK IH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQzRDo6Z2V0UmVuZGVyYnVmZmVyUGFyYW1ldGVyaXYo R0MzRGVudW0gdGFyZ2V0LCBHQzNEZW51bSBwbmFtZSwgR0MzRGludCogdmFsdWUpCkBAIC0xMzU5 LDcgKzE0MTMsOCBAQCBTdHJpbmcgR3JhcGhpY3NDb250ZXh0M0Q6OmdldFNoYWRlckluZm9MCiAg ICAgYXV0byBpbmZvID0gc3RkOjptYWtlX3VuaXF1ZTxHTGNoYXJbXT4obGVuZ3RoKTsKICAgICA6 OmdsR2V0U2hhZGVySW5mb0xvZyhzaGFkZXIsIGxlbmd0aCwgJnNpemUsIGluZm8uZ2V0KCkpOwog Ci0gICAgcmV0dXJuIFN0cmluZyhpbmZvLmdldCgpKTsKKyAgICBQbGF0Zm9ybTNET2JqZWN0IHNo YWRlcnNbMl0gPSB7IHNoYWRlciwgMCB9OworICAgIHJldHVybiBnZXRVbm1hbmdsZWRJbmZvTG9n KHNoYWRlcnMsIDEsIFN0cmluZyhpbmZvLmdldCgpKSk7CiB9CiAKIFN0cmluZyBHcmFwaGljc0Nv bnRleHQzRDo6Z2V0U2hhZGVyU291cmNlKFBsYXRmb3JtM0RPYmplY3Qgc2hhZGVyKQpJbmRleDog TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxv ZwkocmV2aXNpb24gMTYxODAzKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTQtMDEtMTEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hh bUBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkdMXSBFcnJvciBtZXNzYWdlcyBzaG91bGQgdXNl IHNvdXJjZSBjb2RlIGxhYmVscywgbm90IGludGVybmFsIG1hbmdsZWQgc3ltYm9scy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjgzMgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9jYW52YXMv d2ViZ2wvZ2xzbC1jb25mb3JtYW5jZS5odG1sOiBBZGQgbG9nIHRvIHByb2dyYW0gb3V0cHV0Cisg ICAgICAgIHNob3dpbmcgZXJyb3IgbWVzc2FnZSB0byBjb25maXJtIHByb3BlciBsYWJlbHMgYXJl IGJlaW5nIHVzZWQuCisgICAgICAgICogZmFzdC9jYW52YXMvd2ViZ2wvZ2xzbC1jb25mb3JtYW5j ZS1leHBlY3RlZC50eHQ6IHVwZGF0ZWQuCisKIDIwMTQtMDEtMTEgIEJyZW50IEZ1bGdoYW0gIDxi ZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYkdMXSBDb3JyZWN0IHVuaWZvcm0gaW5w dXQgdmFsaWRhdGlvbiBmb3IgdGV4dHVyZSBzYW1wbGVyIHVuaWZvcm1zCkluZGV4OiBMYXlvdXRU ZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9nbHNsLWNvbmZvcm1hbmNlLWV4cGVjdGVkLnR4dAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9nbHNsLWNvbmZvcm1hbmNl LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMTYxNzg4KQorKysgTGF5b3V0VGVzdHMvZmFzdC9jYW52 YXMvd2ViZ2wvZ2xzbC1jb25mb3JtYW5jZS1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAg LTI4LDYgKzI4LDkgQEAgUEFTUyBbdnNoYWRlcldpdGhJbXBsaWNpdFZlYzNDYXN0L2ZzaGFkZQog UEFTUyBbdnNoYWRlcldpdGhWZXJzaW9uMTMwL2ZzaGFkZXJdOiB2ZXJ0ZXggc2hhZGVyIHVzZXMg dGhlICN2ZXJzaW9uIG5vdCAxMDAgZGlyZWN0aXZlIHNob3VsZCBmYWlsCiBQQVNTIFt2c2hhZGVy V2l0aFZlcnNpb24xMjAvZnNoYWRlcl06IHZlcnRleCBzaGFkZXIgdXNlcyB0aGUgI3ZlcnNpb24g bm90IDEwMCBkaXJlY3RpdmUgc2hvdWxkIGZhaWwKIFBBU1MgW3ZzaGFkZXJXaXRoVmVyc2lvbjEw MC9mc2hhZGVyXTogdmVydGV4IHNoYWRlciB1c2VzIHRoZSAjdmVyc2lvbiAxMDAgZGlyZWN0aXZl IHNob3VsZCBzdWNjZWVkCitQcm9ncmFtIGxpbmsgbG9nOkVSUk9SOiBJbnB1dCBvZiBmcmFnbWVu dCBzaGFkZXIgJ3ZfdmFyeWluZycgbm90IHdyaXR0ZW4gYnkgdmVydGV4IHNoYWRlcgorCitQQVNT IFt2c2hhZGVyV2l0aFZlcnNpb24xMDAvZnJhZ21lbnRTaGFkZXJVc2VkVmFyeWluZ106IHZlcnRl eCBzaGFkZXIgd2l0aCBubyB2YXJ5aW5nIGFuZCBmcmFnbWVudCBzaGFkZXIgd2l0aCB1c2VkIHZh cnlpbmcgbXVzdCBmYWlsCiBQQVNTIFtzaGFkZXJzL2ltcGxpY2l0L2FkZF9pbnRfZmxvYXQudmVy dC9mc2hhZGVyXTogaW1wbGljaXQgY2FzdCBhZGRpbmcgaW50ZWdlciB0byBmbG9hdCBzaG91bGQg ZmFpbAogUEFTUyBbc2hhZGVycy9pbXBsaWNpdC9hZGRfaW50X21hdDIudmVydC9mc2hhZGVyXTog aW1wbGljaXQgY2FzdCBhZGRpbmcgaW50ZWdlciB0byBtYXQyIHNob3VsZCBmYWlsCiBQQVNTIFtz aGFkZXJzL2ltcGxpY2l0L2FkZF9pbnRfbWF0My52ZXJ0L2ZzaGFkZXJdOiBpbXBsaWNpdCBjYXN0 IGFkZGluZyBpbnRlZ2VyIHRvIG1hdDMgc2hvdWxkIGZhaWwKSW5kZXg6IExheW91dFRlc3RzL2Zh c3QvY2FudmFzL3dlYmdsL2dsc2wtY29uZm9ybWFuY2UuaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9nbHNsLWNvbmZvcm1hbmNlLmh0bWwJKHJldmlzaW9u IDE2MTc4OCkKKysrIExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL2dsc2wtY29uZm9ybWFu Y2UuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMjExLDYgKzIxMSwxNiBAQCB2b2lkIG1haW4oKQog ICAgIGdsX1Bvc2l0aW9uID0gdlBvc2l0aW9uOwogfQogPC9zY3JpcHQ+Cis8c2NyaXB0IGlkPSJm cmFnbWVudFNoYWRlclVzZWRWYXJ5aW5nIiB0eXBlPSJ0ZXh0L3NvbWV0aGluZy1ub3QtamF2YXNj cmlwdCI+CitwcmVjaXNpb24gbWVkaXVtcCBmbG9hdDsKKwordmFyeWluZyB2ZWM0IHZfdmFyeWlu ZzsKKwordm9pZCBtYWluKCkKK3sKKyAgICBnbF9GcmFnQ29sb3IgPSB2X3Zhcnlpbmc7Cit9Cis8 L3NjcmlwdD4KIDxzY3JpcHQgaWQ9InZzaGFkZXJXaXRoX19GSUxFX18iIHR5cGU9InRleHQvc29t ZXRoaW5nLW5vdC1qYXZhc2NyaXB0Ij4KIF9fRklMRV9fCiA8L3NjcmlwdD4KQEAgLTQwMyw2ICs0 MTMsMTMgQEAgaWYgKCFnbCkgewogICAgICAgbGlua1N1Y2Nlc3M6IHRydWUsCiAgICAgICBwYXNz TXNnOiAndmVydGV4IHNoYWRlciB1c2VzIHRoZSAjdmVyc2lvbiAxMDAgZGlyZWN0aXZlIHNob3Vs ZCBzdWNjZWVkJywKICAgICB9LAorICAgIHsgdlNoYWRlcklkOiAndnNoYWRlcldpdGhWZXJzaW9u MTAwJywKKyAgICAgIHZTaGFkZXJTdWNjZXNzOiB0cnVlLAorICAgICAgZlNoYWRlcklkOiAnZnJh Z21lbnRTaGFkZXJVc2VkVmFyeWluZycsCisgICAgICBmU2hhZGVyU3VjY2VzczogdHJ1ZSwKKyAg ICAgIGxpbmtTdWNjZXNzOiBmYWxzZSwKKyAgICAgIHBhc3NNc2c6ICd2ZXJ0ZXggc2hhZGVyIHdp dGggbm8gdmFyeWluZyBhbmQgZnJhZ21lbnQgc2hhZGVyIHdpdGggdXNlZCB2YXJ5aW5nIG11c3Qg ZmFpbCcsCisgICAgfSwKICAgXTsKIAogICAvLyBSZWFkIGluIGFsbCB0aGUgc2hhZGVyIHNvdXJj ZS4KQEAgLTQ5OCwxMyArNTE1LDE3IEBAIGlmICghZ2wpIHsKICAgICAgIGdsLmxpbmtQcm9ncmFt KHByb2dyYW0pOwogICAgICAgdmFyIGxpbmtlZCA9IChnbC5nZXRQcm9ncmFtUGFyYW1ldGVyKHBy b2dyYW0sIGdsLkxJTktfU1RBVFVTKSAhPSAwKTsKICAgICAgIGlmICghbGlua2VkKSB7Ci0gICAg ICAgIHZhciBlcnJvciA9IGdsLmdldFByb2dyYW1JbmZvTG9nKHNoYWRlcik7CisgICAgICAgIHZh ciBlcnJvciA9IGdsLmdldFByb2dyYW1JbmZvTG9nKHByb2dyYW0pOwogICAgICAgICBsb2coIioq KiBFcnJvciBsaW5raW5nIHByb2dyYW0gJyIrcHJvZ3JhbSsiJzoiK2Vycm9yKTsKICAgICAgIH0K ICAgICAgIGlmIChsaW5rZWQgIT0gaW5mby5saW5rU3VjY2VzcykgewogICAgICAgICB0ZXN0RmFp bGVkKHBhc3NNc2cpOwogICAgICAgICBjb250aW51ZTsKICAgICAgIH0KKyAgICAgIGlmICghaW5m by5saW5rU3VjY2VzcykgeworICAgICAgICB2YXIgZXJyb3IgPSBnbC5nZXRQcm9ncmFtSW5mb0xv Zyhwcm9ncmFtKTsKKyAgICAgICAgZGVidWcoIlByb2dyYW0gbGluayBsb2c6IiArIGVycm9yKTsK KyAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgaWYgKGluZm8ubGlua1N1Y2Nlc3MpIHsKICAg ICAgICAgdGVzdEZhaWxlZChwYXNzTXNnKTsK