89346 2012-06-18 06:51:27 -0700 [Cairo] Fix memory leaks in GLContextGLX.cpp 2012-06-18 22:34:45 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 naginenis naginenis mrobinson oldest_to_newest 651357 0 naginenis 2012-06-18 06:51:27 -0700 The following memory leaks found in GLContextGLX with different scenarios. 1) The last element in the ActiveContextList is not getting deleted, so pbuffer returned by glXCreatePbuffer is leaking. http://trac.webkit.org/browser/trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp#L74 ==27018== 264 (208 direct, 56 indirect) bytes in 1 blocks are definitely lost in loss record 13,415 of 14,618 ==27018== at 0x4C2B6CD: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==27018== by 0x1091340A: ??? (in /usr/lib/x86_64-linux-gnu/mesa/libGL.so.1.2) ==27018== by 0x1090D513: ??? (in /usr/lib/x86_64-linux-gnu/mesa/libGL.so.1.2) ==27018== by 0x1090DAC2: ??? (in /usr/lib/x86_64-linux-gnu/mesa/libGL.so.1.2) ==27018== by 0x8276603: WebCore::GLContextGLX::createPbufferContext(__GLXcontextRec*) (GLContextGLX.cpp:135) ==27018== by 0x82769A1: WebCore::GLContextGLX::createContext(unsigned long, WebCore::GLContext*) (GLContextGLX.cpp:212) ==27018== by 0x8277AFA: WebCore::GLContext::createOffscreenContext(WebCore::GLContext*) (GLContext.cpp:54) ==27018== by 0x7CE3C64: WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate(WebCore::GraphicsContext3D*) (GraphicsContext3DPrivate.cpp:41) ==27018== by 0x7CE3BF8: WebCore::GraphicsContext3DPrivate::create(WebCore::GraphicsContext3D*) (GraphicsContext3DPrivate.cpp:36) ==27018== by 0x7CE26E7: WebCore::GraphicsContext3D::GraphicsContext3D(WebCore::GraphicsContext3D::Attributes, WebCore::HostWindow*, bool) (GraphicsContext3DCairo.cpp:79) ==27018== by 0x7CE254A: WebCore::GraphicsContext3D::create(WebCore::GraphicsContext3D::Attributes, WebCore::HostWindow*, WebCore::GraphicsContext3D::RenderStyle) (GraphicsContext3DCairo.cpp:62) ==27018== by 0x7CAD268: WebCore::WebGLRenderingContext::create(WebCore::HTMLCanvasElement*, WebCore::WebGLContextAttributes*) (WebGLRenderingContext.cpp:414) ==27018== by 0x737AE71: WebCore::HTMLCanvasElement::getContext(WTF::String const&, WebCore::CanvasContextAttributes*) (HTMLCanvasElement.cpp:201) ==27018== by 0x6F640BF: WebCore::JSHTMLCanvasElement::getContext(JSC::ExecState*) (JSHTMLCanvasElementCustom.cpp:77) ==27018== by 0x7E54616: WebCore::jsHTMLCanvasElementPrototypeFunctionGetContext(JSC::ExecState*) (JSHTMLCanvasElement.cpp:210) 2) pbuffer is leaking when the context is null. http://trac.webkit.org/browser/trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp#L141 ==11123== 1,488 (208 direct, 1,280 indirect) bytes in 1 blocks are definitely lost in loss record 13,955 of 14,422 ==11123== at 0x4C2B6CD: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==11123== by 0x1091340A: ??? (in /usr/lib/x86_64-linux-gnu/mesa/libGL.so.1.2) ==11123== by 0x1090D513: ??? (in /usr/lib/x86_64-linux-gnu/mesa/libGL.so.1.2) ==11123== by 0x1090DAC2: ??? (in /usr/lib/x86_64-linux-gnu/mesa/libGL.so.1.2) ==11123== by 0x8276603: WebCore::GLContextGLX::createPbufferContext(__GLXcontextRec*) (GLContextGLX.cpp:135) ==11123== by 0x8276995: WebCore::GLContextGLX::createContext(unsigned long, WebCore::GLContext*) (GLContextGLX.cpp:212) ==11123== by 0x8277AEE: WebCore::GLContext::createOffscreenContext(WebCore::GLContext*) (GLContext.cpp:54) ==11123== by 0x8277A09: WebCore::GLContext::sharingContext() (GLContext.cpp:35) ==11123== by 0x7CE3C52: WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate(WebCore::GraphicsContext3D*) (GraphicsContext3DPrivate.cpp:41) ==11123== by 0x7CE3BF8: WebCore::GraphicsContext3DPrivate::create(WebCore::GraphicsContext3D*) (GraphicsContext3DPrivate.cpp:36) ==11123== by 0x7CE26E7: WebCore::GraphicsContext3D::GraphicsContext3D(WebCore::GraphicsContext3D::Attributes, WebCore::HostWindow*, bool) (GraphicsContext3DCairo.cpp:79) ==11123== by 0x7CE254A: WebCore::GraphicsContext3D::create(WebCore::GraphicsContext3D::Attributes, WebCore::HostWindow*, WebCore::GraphicsContext3D::RenderStyle) (GraphicsContext3DCairo.cpp:62) ==11123== by 0x7CAD268: WebCore::WebGLRenderingContext::create(WebCore::HTMLCanvasElement*, WebCore::WebGLContextAttributes*) (WebGLRenderingContext.cpp:414) ==11123== by 0x737AE71: WebCore::HTMLCanvasElement::getContext(WTF::String const&, WebCore::CanvasContextAttributes*) (HTMLCanvasElement.cpp:201) ==11123== by 0x6F640BF: WebCore::JSHTMLCanvasElement::getContext(JSC::ExecState*) (JSHTMLCanvasElementCustom.cpp:77) ==11123== by 0x7E54616: WebCore::jsHTMLCanvasElementPrototypeFunctionGetContext(JSC::ExecState*) (JSHTMLCanvasElement.cpp:210) 3) The reason for this leak is same as 1), when we call createPixmapContext(). ==11123== 32 bytes in 1 blocks are definitely lost in loss record 4,574 of 14,422 ==11123== at 0x4C2B6CD: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==11123== by 0x108EBAE9: glXCreateGLXPixmap (in /usr/lib/x86_64-linux-gnu/mesa/libGL.so.1.2) ==11123== by 0x8276808: WebCore::GLContextGLX::createPixmapContext(__GLXcontextRec*) (GLContextGLX.cpp:184) ==11123== by 0x82769D7: WebCore::GLContextGLX::createContext(unsigned long, WebCore::GLContext*) (GLContextGLX.cpp:214) ==11123== by 0x8277AEE: WebCore::GLContext::createOffscreenContext(WebCore::GLContext*) (GLContext.cpp:54) ==11123== by 0x7CE3C64: WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate(WebCore::GraphicsContext3D*) (GraphicsContext3DPrivate.cpp:41) ==11123== by 0x7CE3BF8: WebCore::GraphicsContext3DPrivate::create(WebCore::GraphicsContext3D*) (GraphicsContext3DPrivate.cpp:36) ==11123== by 0x7CE26E7: WebCore::GraphicsContext3D::GraphicsContext3D(WebCore::GraphicsContext3D::Attributes, WebCore::HostWindow*, bool) (GraphicsContext3DCairo.cpp:79) ==11123== by 0x7CE254A: WebCore::GraphicsContext3D::create(WebCore::GraphicsContext3D::Attributes, WebCore::HostWindow*, WebCore::GraphicsContext3D::RenderStyle) (GraphicsContext3DCairo.cpp:62) ==11123== by 0x7CAD268: WebCore::WebGLRenderingContext::create(WebCore::HTMLCanvasElement*, WebCore::WebGLContextAttributes*) (WebGLRenderingContext.cpp:414) ==11123== by 0x737AE71: WebCore::HTMLCanvasElement::getContext(WTF::String const&, WebCore::CanvasContextAttributes*) (HTMLCanvasElement.cpp:201) ==11123== by 0x6F640BF: WebCore::JSHTMLCanvasElement::getContext(JSC::ExecState*) (JSHTMLCanvasElementCustom.cpp:77) ==11123== by 0x7E54616: WebCore::jsHTMLCanvasElementPrototypeFunctionGetContext(JSC::ExecState*) (JSHTMLCanvasElement.cpp:210) 4) visualInfo is leaking here. http://trac.webkit.org/browser/trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp#L185 ==11123== 640 bytes in 1 blocks are definitely lost in loss record 13,620 of 14,422 ==11123== at 0x4C2B6CD: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==11123== by 0x11DB7915: XGetVisualInfo (VisUtil.c:78) ==11123== by 0x108EAE5F: glXChooseVisual (in /usr/lib/x86_64-linux-gnu/mesa/libGL.so.1.2) ==11123== by 0x827671C: WebCore::GLContextGLX::createPixmapContext(__GLXcontextRec*) (GLContextGLX.cpp:168) ==11123== by 0x82769D7: WebCore::GLContextGLX::createContext(unsigned long, WebCore::GLContext*) (GLContextGLX.cpp:214) ==11123== by 0x8277AEE: WebCore::GLContext::createOffscreenContext(WebCore::GLContext*) (GLContext.cpp:54) ==11123== by 0x8277A09: WebCore::GLContext::sharingContext() (GLContext.cpp:35) ==11123== by 0x7CE3C52: WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate(WebCore::GraphicsContext3D*) (GraphicsContext3DPrivate.cpp:41) ==11123== by 0x7CE3BF8: WebCore::GraphicsContext3DPrivate::create(WebCore::GraphicsContext3D*) (GraphicsContext3DPrivate.cpp:36) ==11123== by 0x7CE26E7: WebCore::GraphicsContext3D::GraphicsContext3D(WebCore::GraphicsContext3D::Attributes, WebCore::HostWindow*, bool) (GraphicsContext3DCairo.cpp:79) ==11123== by 0x7CE254A: WebCore::GraphicsContext3D::create(WebCore::GraphicsContext3D::Attributes, WebCore::HostWindow*, WebCore::GraphicsContext3D::RenderStyle) (GraphicsContext3DCairo.cpp:62) ==11123== by 0x7CAD268: WebCore::WebGLRenderingContext::create(WebCore::HTMLCanvasElement*, WebCore::WebGLContextAttributes*) (WebGLRenderingContext.cpp:414) ==11123== by 0x737AE71: WebCore::HTMLCanvasElement::getContext(WTF::String const&, WebCore::CanvasContextAttributes*) (HTMLCanvasElement.cpp:201) ==11123== by 0x6F640BF: WebCore::JSHTMLCanvasElement::getContext(JSC::ExecState*) (JSHTMLCanvasElementCustom.cpp:77) ==11123== by 0x7E54616: WebCore::jsHTMLCanvasElementPrototypeFunctionGetContext(JSC::ExecState*) (JSHTMLCanvasElement.cpp:210) 651379 1 148096 naginenis 2012-06-18 07:34:12 -0700 Created attachment 148096 Patch Fixed memory leaks. 651387 2 148096 mrobinson 2012-06-18 07:58:52 -0700 Comment on attachment 148096 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=148096&action=review > Source/WebCore/platform/graphics/glx/GLContextGLX.cpp:75 > - for (size_t i = 0; i < contextList.size(); ++i) > - delete contextList[i]; > + for (size_t i = contextList.size(); i > 0; --i) > + delete contextList[i - 1]; I'm not sure I understand this. Why is the last element leaking here and why does iterating backward help? 651417 3 148096 naginenis 2012-06-18 08:57:56 -0700 Comment on attachment 148096 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=148096&action=review >> Source/WebCore/platform/graphics/glx/GLContextGLX.cpp:75 >> + delete contextList[i - 1]; > > I'm not sure I understand this. Why is the last element leaking here and why does iterating backward help? contextList.size() is getting updated after removing the element from the vector in GLContextGLX::removeActiveContext(). So, the for loop termination condition returns always false in the last iteration, when we have more than one element. For example, when we have two elements in the vector, after the first iteration the size becomes 1 and the loop exits, so the second element leaks. I'm iterating the vector backward so that the loop termination condition doesn't fail until the contextList.size() reaches 0. 651439 4 148096 mrobinson 2012-06-18 09:27:59 -0700 Comment on attachment 148096 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=148096&action=review >>> Source/WebCore/platform/graphics/glx/GLContextGLX.cpp:75 >>> + delete contextList[i - 1]; >> >> I'm not sure I understand this. Why is the last element leaking here and why does iterating backward help? > > contextList.size() is getting updated after removing the element from the vector in GLContextGLX::removeActiveContext(). So, the for loop termination condition returns always false in the last iteration, when we have more than one element. For example, when we have two elements in the vector, after the first iteration the size becomes 1 and the loop exits, so the second element leaks. > > I'm iterating the vector backward so that the loop termination condition doesn't fail until the contextList.size() reaches 0. This sort of thing deserves a comment, I think. :) 651586 5 148096 naginenis 2012-06-18 11:42:30 -0700 Comment on attachment 148096 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=148096&action=review >>>> Source/WebCore/platform/graphics/glx/GLContextGLX.cpp:75 >>>> + delete contextList[i - 1]; >>> >>> I'm not sure I understand this. Why is the last element leaking here and why does iterating backward help? >> >> contextList.size() is getting updated after removing the element from the vector in GLContextGLX::removeActiveContext(). So, the for loop termination condition returns always false in the last iteration, when we have more than one element. For example, when we have two elements in the vector, after the first iteration the size becomes 1 and the loop exits, so the second element leaks. >> >> I'm iterating the vector backward so that the loop termination condition doesn't fail until the contextList.size() reaches 0. > > This sort of thing deserves a comment, I think. :) Sure. I will add a comment and update the changelog also. 651596 6 148143 naginenis 2012-06-18 11:49:02 -0700 Created attachment 148143 Patch Updated patch taking Martin's feedback into consideration. 651605 7 148143 mrobinson 2012-06-18 11:55:04 -0700 Comment on attachment 148143 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=148143&action=review > Source/WebCore/platform/graphics/glx/GLContextGLX.cpp:75 > + // Iterate the vector backwards, so that the loop termination condition > + // doesn't fail until the size() reaches 0. This still leaves the situation slightly obscure. The comment should specifically mention that delete contextList[i -1] removes the context from the vector as a side effect. In fact, maybe it's better to just do a check in GLContextGLX::removeActiveContext that we aren't cleaning up the list at exit. 651609 8 mrobinson 2012-06-18 12:06:42 -0700 If you like, I can make this change and land the patch or you can update the patch and use the cq. It's up to you. 652039 9 mrobinson 2012-06-18 22:34:45 -0700 Committed r120673: <http://trac.webkit.org/changeset/120673> 148096 2012-06-18 07:34:12 -0700 2012-06-18 11:49:02 -0700 Patch 89346.patch text/plain 2438 naginenis ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyMGIzMDY1Li42N2QzNjMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTItMDYtMTggIFN1ZGFyc2FuYSBOYWdpbmVuaSAgPHN1ZGFyc2FuYS5uYWdpbmVuaUBs aW51eC5pbnRlbC5jb20+CisKKyAgICAgICAgW0NhaXJvXSBGaXggbWVtb3J5IGxlYWtzIGluIEdM Q29udGV4dEdMWC5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTg5MzQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRml4IG1lbW9yeSBsZWFrcyBmb3VuZCBpbiBHTENvbnRleHRHTFguY3BwLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ2x4L0dMQ29udGV4dEdMWC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpHTENvbnRleHRHTFg6OmNsZWFudXBBY3RpdmVDb250ZXh0c0F0RXhpdCk6IFRoZSBs YXN0IGVsZW1lbnQKKyAgICAgICAgaW4gdGhlIEFjdGl2ZUNvbnRleHRMaXN0IGlzIGFsd2F5cyBs ZWFraW5nLCBzbyBpdGVyYXRpbmcgdGhlIHZlY3RvcgorICAgICAgICBiYWNrd2FyZHMgdG8gZnJl ZSBhbGwgdGhlIGVsZW1lbnRzLgorICAgICAgICAoV2ViQ29yZTo6R0xDb250ZXh0R0xYOjpjcmVh dGVQYnVmZmVyQ29udGV4dCk6IERlbGV0ZSBHTFhQYnVmZmVyCisgICAgICAgIHJldHVybmVkIGJ5 IGdsWENyZWF0ZVBidWZmZXIoKS4KKyAgICAgICAgKFdlYkNvcmU6OkdMQ29udGV4dEdMWDo6Y3Jl YXRlUGl4bWFwQ29udGV4dCk6IERlbGV0ZSBYVmlzdWFsSW5mbworICAgICAgICByZXR1cm5lZCBi eSBnbFhDaG9vc2VWaXN1YWwoKS4KKwogMjAxMi0wNi0xOCAgVGFpanUgVHN1aWtpICA8dHppa0Bj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgRml4IHN5bnRheCBvZiBGaWxlUmVhZGVyOjpyZWFkQXNE YXRhVVJMIHJlc3VsdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ2x4L0dMQ29udGV4dEdMWC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nbHgvR0xDb250ZXh0R0xYLmNwcAppbmRleCA5NDUyYzQ0Li42ZGMwN2I2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nbHgvR0xDb250ZXh0R0xYLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nbHgvR0xDb250ZXh0R0xYLmNw cApAQCAtNzEsOCArNzEsOCBAQCB2b2lkIEdMQ29udGV4dEdMWDo6cmVtb3ZlQWN0aXZlQ29udGV4 dChHTENvbnRleHQqIGNvbnRleHQpCiB2b2lkIEdMQ29udGV4dEdMWDo6Y2xlYW51cEFjdGl2ZUNv bnRleHRzQXRFeGl0KCkKIHsKICAgICBBY3RpdmVDb250ZXh0TGlzdCYgY29udGV4dExpc3QgPSBh Y3RpdmVDb250ZXh0TGlzdCgpOwotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY29udGV4dExp c3Quc2l6ZSgpOyArK2kpCi0gICAgICAgIGRlbGV0ZSBjb250ZXh0TGlzdFtpXTsKKyAgICBmb3Ig KHNpemVfdCBpID0gY29udGV4dExpc3Quc2l6ZSgpOyBpID4gMDsgLS1pKQorICAgICAgICBkZWxl dGUgY29udGV4dExpc3RbaSAtIDFdOwogCiAgICAgaWYgKCFnU2hhcmVkRGlzcGxheSkKICAgICAg ICAgcmV0dXJuOwpAQCAtMTM4LDggKzEzOCwxMCBAQCBQYXNzT3duUHRyPEdMQ29udGV4dEdMWD4g R0xDb250ZXh0R0xYOjpjcmVhdGVQYnVmZmVyQ29udGV4dChHTFhDb250ZXh0IHNoYXJpbmdDbwog CiAgICAgR0xYQ29udGV4dCBjb250ZXh0ID0gZ2xYQ3JlYXRlTmV3Q29udGV4dChkaXNwbGF5LCBj b25maWdzWzBdLCBHTFhfUkdCQV9UWVBFLCBzaGFyaW5nQ29udGV4dCwgR0xfVFJVRSk7CiAgICAg WEZyZWUoY29uZmlncyk7Ci0gICAgaWYgKCFjb250ZXh0KQorICAgIGlmICghY29udGV4dCkgewor ICAgICAgICBnbFhEZXN0cm95UGJ1ZmZlcihkaXNwbGF5LCBwYnVmZmVyKTsKICAgICAgICAgcmV0 dXJuIG51bGxwdHI7CisgICAgfQogCiAgICAgLy8gR0xYUGJ1ZmZlciBhbmQgWElEIGFyZSBib3Ro IHRoZSBzYW1lIHR5cGVzIHVuZGVybmVhdGgsIHNvIHdlIGhhdmUgdG8gc2hhcmUKICAgICAvLyBh IGNvbnN0cnVjdG9yIGhlcmUgd2l0aCB0aGUgd2luZG93IHBhdGguCkBAIC0xODMsNiArMTg1LDcg QEAgUGFzc093blB0cjxHTENvbnRleHRHTFg+IEdMQ29udGV4dEdMWDo6Y3JlYXRlUGl4bWFwQ29u dGV4dChHTFhDb250ZXh0IHNoYXJpbmdDb24KICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAg fQogCisgICAgWEZyZWUodmlzdWFsSW5mbyk7CiAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBHTENv bnRleHRHTFgoY29udGV4dCwgcGl4bWFwLCBnbHhQaXhtYXApKTsKIH0KIAo= 148143 2012-06-18 11:49:02 -0700 2012-06-18 16:56:00 -0700 Patch 89346.patch text/plain 2756 naginenis ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyMGIzMDY1Li5jODZhNGNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTItMDYtMTggIFN1ZGFyc2FuYSBOYWdpbmVuaSAgPHN1ZGFyc2FuYS5uYWdpbmVuaUBs aW51eC5pbnRlbC5jb20+CisKKyAgICAgICAgW0NhaXJvXSBGaXggbWVtb3J5IGxlYWtzIGluIEdM Q29udGV4dEdMWC5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTg5MzQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRml4IG1lbW9yeSBsZWFrcyBmb3VuZCBpbiBHTENvbnRleHRHTFguY3BwLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ2x4L0dMQ29udGV4dEdMWC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpHTENvbnRleHRHTFg6OmNsZWFudXBBY3RpdmVDb250ZXh0c0F0RXhpdCk6IFJlbW92 aW5nIGVsZW1lbnQgcmVkdWNlcworICAgICAgICBzaXplIG9mIHRoZSB2ZWN0b3IsIHNvIHRoZSBs b29wIHRlcm1pbmF0aW9uIGNvbmRpdGlvbiB3YXMgZmFpbGluZyBpbiB0aGUgbGFzdAorICAgICAg ICBpdGVyYXRpb24sIHdoZW4gdGhlIHZlY3RvciBjb250YWlucyBtb3JlIHRoYW4gb25lIGVsZW1l bnQuIFRoaXMgcGF0Y2ggZml4ZXMgdGhlCisgICAgICAgIGlzc3VlIGJ5IGl0ZXJhdGluZyB0aGUg dmVjdG9yIGJhY2t3YXJkcywgc28gdGhlIHRlcm1pbmF0aW9uIGNvbmRpdGlvbiBkb2Vzbid0Cisg ICAgICAgIGZhaWwgdW50aWwgdGhlIHNpemUoKSByZWFjaGVzIDAuCisgICAgICAgIChXZWJDb3Jl OjpHTENvbnRleHRHTFg6OmNyZWF0ZVBidWZmZXJDb250ZXh0KTogRGVsZXRlIEdMWFBidWZmZXIK KyAgICAgICAgcmV0dXJuZWQgYnkgZ2xYQ3JlYXRlUGJ1ZmZlcigpLgorICAgICAgICAoV2ViQ29y ZTo6R0xDb250ZXh0R0xYOjpjcmVhdGVQaXhtYXBDb250ZXh0KTogRGVsZXRlIFhWaXN1YWxJbmZv CisgICAgICAgIHJldHVybmVkIGJ5IGdsWENob29zZVZpc3VhbCgpLgorCiAyMDEyLTA2LTE4ICBU YWlqdSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBGaXggc3ludGF4IG9m IEZpbGVSZWFkZXI6OnJlYWRBc0RhdGFVUkwgcmVzdWx0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nbHgvR0xDb250ZXh0R0xYLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dseC9HTENvbnRleHRHTFguY3BwCmluZGV4IDk0NTJjNDQu LjUwY2NiODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ds eC9HTENvbnRleHRHTFguY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dseC9HTENvbnRleHRHTFguY3BwCkBAIC03MSw4ICs3MSwxMCBAQCB2b2lkIEdMQ29udGV4dEdM WDo6cmVtb3ZlQWN0aXZlQ29udGV4dChHTENvbnRleHQqIGNvbnRleHQpCiB2b2lkIEdMQ29udGV4 dEdMWDo6Y2xlYW51cEFjdGl2ZUNvbnRleHRzQXRFeGl0KCkKIHsKICAgICBBY3RpdmVDb250ZXh0 TGlzdCYgY29udGV4dExpc3QgPSBhY3RpdmVDb250ZXh0TGlzdCgpOwotICAgIGZvciAoc2l6ZV90 IGkgPSAwOyBpIDwgY29udGV4dExpc3Quc2l6ZSgpOyArK2kpCi0gICAgICAgIGRlbGV0ZSBjb250 ZXh0TGlzdFtpXTsKKyAgICAvLyBJdGVyYXRlIHRoZSB2ZWN0b3IgYmFja3dhcmRzLCBzbyB0aGF0 IHRoZSBsb29wIHRlcm1pbmF0aW9uIGNvbmRpdGlvbgorICAgIC8vIGRvZXNuJ3QgZmFpbCB1bnRp bCB0aGUgc2l6ZSgpIHJlYWNoZXMgMC4KKyAgICBmb3IgKHNpemVfdCBpID0gY29udGV4dExpc3Qu c2l6ZSgpOyBpID4gMDsgLS1pKQorICAgICAgICBkZWxldGUgY29udGV4dExpc3RbaSAtIDFdOwog CiAgICAgaWYgKCFnU2hhcmVkRGlzcGxheSkKICAgICAgICAgcmV0dXJuOwpAQCAtMTM4LDggKzE0 MCwxMCBAQCBQYXNzT3duUHRyPEdMQ29udGV4dEdMWD4gR0xDb250ZXh0R0xYOjpjcmVhdGVQYnVm ZmVyQ29udGV4dChHTFhDb250ZXh0IHNoYXJpbmdDbwogCiAgICAgR0xYQ29udGV4dCBjb250ZXh0 ID0gZ2xYQ3JlYXRlTmV3Q29udGV4dChkaXNwbGF5LCBjb25maWdzWzBdLCBHTFhfUkdCQV9UWVBF LCBzaGFyaW5nQ29udGV4dCwgR0xfVFJVRSk7CiAgICAgWEZyZWUoY29uZmlncyk7Ci0gICAgaWYg KCFjb250ZXh0KQorICAgIGlmICghY29udGV4dCkgeworICAgICAgICBnbFhEZXN0cm95UGJ1ZmZl cihkaXNwbGF5LCBwYnVmZmVyKTsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgfQogCiAg ICAgLy8gR0xYUGJ1ZmZlciBhbmQgWElEIGFyZSBib3RoIHRoZSBzYW1lIHR5cGVzIHVuZGVybmVh dGgsIHNvIHdlIGhhdmUgdG8gc2hhcmUKICAgICAvLyBhIGNvbnN0cnVjdG9yIGhlcmUgd2l0aCB0 aGUgd2luZG93IHBhdGguCkBAIC0xODMsNiArMTg3LDcgQEAgUGFzc093blB0cjxHTENvbnRleHRH TFg+IEdMQ29udGV4dEdMWDo6Y3JlYXRlUGl4bWFwQ29udGV4dChHTFhDb250ZXh0IHNoYXJpbmdD b24KICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCisgICAgWEZyZWUodmlzdWFsSW5m byk7CiAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBHTENvbnRleHRHTFgoY29udGV4dCwgcGl4bWFw LCBnbHhQaXhtYXApKTsKIH0KIAo=