95003 2012-08-25 05:33:45 -0700 [Qt] Segmentation fault when closing QtTestBrowser 2012-09-12 08:36:26 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 rtakacs rtakacs dino hausmann noam webkit.review.bot zherczeg oldest_to_newest 704686 0 rtakacs 2012-08-25 05:33:45 -0700 Segmentation fault occurs when somebody would like to close QtTestBrowser at a WebGL using page. The reason is that we delete 'm_surface' at the ~GraphicsContext3DPrivate(). The 'm_surface' that located at GraphicsContext3DPrivate points to the window so we do not have to delete it. The window will be destroyed at QWidgetPrivate::deleteTLSysExtra(). (qwidget_qpa.cpp) 708443 1 161431 rtakacs 2012-08-30 02:28:06 -0700 Created attachment 161431 patch This patch eliminates the segmentation fault when closing QtTestBrowser at a WebGL using page. 708459 2 161431 gyuyoung.kim 2012-08-30 02:58:52 -0700 Comment on attachment 161431 patch Attachment 161431 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/13685677 708562 3 161431 hausmann 2012-08-30 06:22:09 -0700 Comment on attachment 161431 patch View in context: https://bugs.webkit.org/attachment.cgi?id=161431&action=review > Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp:213 > - delete m_surface; > m_surface = 0; > - // Platform context is assumed to be owned by surface. > m_platformContext = 0; Hmm, I think we have a bigger problem here. There are different cases here when it comes to the creation of the surface: 1) m_surface is allocated through createPlatformGraphicsContext3D, which in createPlatformGraphicsContext3DFromWidget creates a new QGLWidget, takes its windowHandle() and assigns it to surface. Somebody has to delete that QGLWidget, and with the current code it'll be deleted through the code path here. m_surface will be a QSurface and its virtual destructor will take care of deleting the QWindow, but I'm suddenly not sure anymore that deleting the QWidgetWindow will also delete the corresponding QGLWidget. This may require a change in Qt. 2) The surface is adopted via renderStyle == GraphicsContext3D::RenderToCurrentGLContext, in which case deleting it is indeed totally wrong. 3) The surface is created in the #if USE(GRAPHICS_SURFACE) block and an actual QWindow. Deleting m_surface is the right thing to do. Besides m_surface and m_platformContext we could have a third member variable that points to the object we should delete in the destructor. In case (1) that should be the QGLWidget, in case 2 it should be a null pointer (delete 0 being fine) and in the third case it should be the surface. 709775 4 161431 noam 2012-08-31 10:34:03 -0700 Comment on attachment 161431 patch This is not the correct solution, see other comment :) 717193 5 163368 rtakacs 2012-09-11 08:24:19 -0700 Created attachment 163368 patch What is your opinion about this? 717361 6 163368 hausmann 2012-09-11 10:40:47 -0700 Comment on attachment 163368 patch View in context: https://bugs.webkit.org/attachment.cgi?id=163368&action=review I think this patch is almost there :) > Source/WebCore/ChangeLog:15 > + No new tests (OOPS!). You should remove this line :) > Source/WebCore/platform/graphics/GraphicsContext3D.h:73 > +typedef QObject* PlatformGraphicsWindow3D; You can remove this typedef, it's not necessary. > Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp:87 > + PlatformGraphicsWindow3D m_surfaceOwner; Instead just change the type of this straight to a QPointer* :) > Source/WebCore/platform/qt/QWebPageClient.h:112 > + PlatformGraphicsWindow3D* = 0) = 0; And here the last output parameter would also be a QObject* and (similarly in the implementations) 718077 7 163552 rtakacs 2012-09-12 02:00:34 -0700 Created attachment 163552 patch There is no segfault with this patch :) 718122 8 163552 hausmann 2012-09-12 02:53:03 -0700 Comment on attachment 163552 patch View in context: https://bugs.webkit.org/attachment.cgi?id=163552&action=review > Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp:58 > + if (surfaceOwner) > + surfaceOwner = glWidget; I think the type of surfaceOwner needs to be a QObject** for this to work, otherwise surface = glWidget is just going to change the local stack pointer. Instead it needs to be a pointer to a pointer and then it needs to read *surfaceOwner = glWidget. (of course alternatively you could pass a reference to a pointer, that's fine, too) 718349 9 163626 rtakacs 2012-09-12 07:46:28 -0700 Created attachment 163626 patch 718399 10 163626 webkit.review.bot 2012-09-12 08:36:22 -0700 Comment on attachment 163626 patch Clearing flags on attachment: 163626 Committed r128315: <http://trac.webkit.org/changeset/128315> 718400 11 webkit.review.bot 2012-09-12 08:36:26 -0700 All reviewed patches have been landed. Closing bug. 161431 2012-08-30 02:28:06 -0700 2012-09-11 08:24:19 -0700 patch 2012_08_30.diff text/plain 1430 rtakacs ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0YTA1OWEyLi41OWE3NGE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTItMDgtMzAgIFJvbGFuZCBUYWthY3MgIDxydGFrYWNzQGluZi51LXN6ZWdlZC5odT4K KworICAgICAgICBbUXRdIFNlZ21lbnRhdGlvbiBmYXVsdCB3aGVuIGNsb3NpbmcgUXRUZXN0QnJv d3NlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTUw MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAnbV9z dXJmYWNlJyBzaG91bGQgbm90IGJlIGRlbGV0ZWQgYmVjYXVzZSBpdCBkb2VzIG5vdCBhbGxvY2F0 ZSBtZW1vcnksCisgICAgICAgIGp1c3QgcG9pbnRzIHRvIGEgd2luZG93LiBUaGUgcmVmZXJyZWQg bWVtb3J5IHNwYWNlIHdpbGwgYmUgZGVhbGxvY2F0ZWQKKyAgICAgICAgYXQgUVdpZGdldFByaXZh dGU6OmRlbGV0ZVRMU3lzRXh0cmEuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9H cmFwaGljc0NvbnRleHQzRFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4 dDNEUHJpdmF0ZTo6fkdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZSk6CisKIDIwMTItMDgtMzAgIFBh dHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQnVpbGQgZml4 IGZvciBXaW5DRSBhZnRlciByMTI2OTc0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0M0RRdC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHQzRFF0LmNwcAppbmRleCA5OGFk ZWM3Li5hY2Q2YjZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9xdC9HcmFwaGljc0NvbnRleHQzRFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHQzRFF0LmNwcApAQCAtMjA5LDkgKzIwOSw3IEBA IHZvaWQgR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjppbml0aWFsaXplQU5HTEUoKQogR3JhcGhp Y3NDb250ZXh0M0RQcml2YXRlOjp+R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlKCkKIHsKICAgICBp ZiAobV9ob3N0V2luZG93KSB7Ci0gICAgICAgIGRlbGV0ZSBtX3N1cmZhY2U7CiAgICAgICAgIG1f c3VyZmFjZSA9IDA7Ci0gICAgICAgIC8vIFBsYXRmb3JtIGNvbnRleHQgaXMgYXNzdW1lZCB0byBi ZSBvd25lZCBieSBzdXJmYWNlLgogICAgICAgICBtX3BsYXRmb3JtQ29udGV4dCA9IDA7CiAgICAg fQogfQo= 163368 2012-09-11 08:24:19 -0700 2012-09-12 02:00:34 -0700 patch widget.diff text/plain 9289 rtakacs ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhNzU0ZmVkLi43MDI0MjA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTItMDktMTEgIFJvbGFuZCBUYWthY3MgIDxydGFrYWNzQGluZi51LXN6ZWdlZC5odT4K KworICAgICAgICBbUXRdIFNlZ21lbnRhdGlvbiBmYXVsdCB3aGVuIGNsb3NpbmcgUXRUZXN0QnJv d3NlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTUw MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEZWZp bmVkIGEgbmV3IFBsYXRmb3JtR3JhcGhpY3NXaW5kb3czRCAoUU9iamVjdCopIHZhcmlhYmxlLgor ICAgICAgICBJZiBXZWJLaXQxIGlzIHVzZWQsIGl0IHBvaW50cyB0byB0aGUgUUdMV2lkZ2V0IHRo YXQgd2FzIAorICAgICAgICBjcmVhdGVkIGluICdjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4 dDNERnJvbVdpZGdldCcuCisgICAgICAgIElmIFdlYktpdDIgaXMgdXNlZCwgaXQgcG9pbnRzIHRv IHRoZSBRV2luZG93IHRoYXQgd2FzIAorICAgICAgICBjcmVhdGVkIGluIEdyYXBoaWNzQ29udGV4 dDNEUHJpdmF0ZSBjb25zdHJ1Y3Rvci4KKyAgICAgICAgSXQgaXMgbmVjY2Vzc2FyeSBmb3IgZGVh bGxvY2F0aW5nIHRoZW0uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5oOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dDNEUXQuY3BwOgorICAgICAgICAoR3Jh cGhpY3NDb250ZXh0M0RQcml2YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4 dDNEUHJpdmF0ZTo6R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlKToKKyAgICAgICAgKFdlYkNvcmU6 OkdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6fkdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZSk6Cisg ICAgICAgICogcGxhdGZvcm0vcXQvUVdlYlBhZ2VDbGllbnQuaDoKKyAgICAgICAgKFFXZWJQYWdl Q2xpZW50KToKKwogMjAxMi0wOS0xMSAgU2VyZ2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdh bGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBXZWJLaXRHdGsrIGNyYXNoZXMgd2l0aCBub24tVVRG OCBIVFRQIGhlYWRlciBuYW1lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmgKaW5kZXggNDIwNzZmZi4uYjlhZDliYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0Qu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQz RC5oCkBAIC03MCw2ICs3MCw3IEBAIHR5cGVkZWYgQ0dMQ29udGV4dE9iaiBQbGF0Zm9ybUdyYXBo aWNzQ29udGV4dDNEOwogI2VsaWYgUExBVEZPUk0oUVQpCiB0eXBlZGVmIFFPcGVuR0xDb250ZXh0 KiBQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEOwogdHlwZWRlZiBRU3VyZmFjZSogUGxhdGZvcm1H cmFwaGljc1N1cmZhY2UzRDsKK3R5cGVkZWYgUU9iamVjdCogUGxhdGZvcm1HcmFwaGljc1dpbmRv dzNEOwogI2Vsc2UKIHR5cGVkZWYgdm9pZCogUGxhdGZvcm1HcmFwaGljc0NvbnRleHQzRDsKICNl bmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3Jh cGhpY3NDb250ZXh0M0RRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9x dC9HcmFwaGljc0NvbnRleHQzRFF0LmNwcAppbmRleCA5OGFkZWM3Li45OTAwZTMwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHQz RFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGlj c0NvbnRleHQzRFF0LmNwcApAQCAtODQsNiArODQsNyBAQCBwdWJsaWM6CiAgICAgSG9zdFdpbmRv dyogbV9ob3N0V2luZG93OwogICAgIFBsYXRmb3JtR3JhcGhpY3NTdXJmYWNlM0QgbV9zdXJmYWNl OwogICAgIFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0M0QgbV9wbGF0Zm9ybUNvbnRleHQ7CisgICAg UGxhdGZvcm1HcmFwaGljc1dpbmRvdzNEIG1fc3VyZmFjZU93bmVyOwogI2lmIFVTRShHUkFQSElD U19TVVJGQUNFKQogICAgIEdyYXBoaWNzU3VyZmFjZTo6RmxhZ3MgbV9zdXJmYWNlRmxhZ3M7CiAg ICAgUmVmUHRyPEdyYXBoaWNzU3VyZmFjZT4gbV9ncmFwaGljc1N1cmZhY2U7CkBAIC0xMTEsMTEg KzExMiwxMiBAQCBHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OkdyYXBoaWNzQ29udGV4dDNEUHJp dmF0ZShHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCwgSAogICAgICwgbV9ob3N0V2luZG93KGhv c3RXaW5kb3cpCiAgICAgLCBtX3N1cmZhY2UoMCkKICAgICAsIG1fcGxhdGZvcm1Db250ZXh0KDAp CisgICAgLCBtX3N1cmZhY2VPd25lcigwKQogewogICAgIGlmIChtX2hvc3RXaW5kb3cgJiYgbV9o b3N0V2luZG93LT5wbGF0Zm9ybVBhZ2VDbGllbnQoKSkgewogICAgICAgICAvLyBUaGlzIGlzIHRo ZSBXZWJLaXQxIGNvZGUgcGF0aC4KICAgICAgICAgUVdlYlBhZ2VDbGllbnQqIHdlYlBhZ2VDbGll bnQgPSBtX2hvc3RXaW5kb3ctPnBsYXRmb3JtUGFnZUNsaWVudCgpOwotICAgICAgICB3ZWJQYWdl Q2xpZW50LT5jcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKCZtX3BsYXRmb3JtQ29udGV4 dCwgJm1fc3VyZmFjZSk7CisgICAgICAgIHdlYlBhZ2VDbGllbnQtPmNyZWF0ZVBsYXRmb3JtR3Jh cGhpY3NDb250ZXh0M0QoJm1fcGxhdGZvcm1Db250ZXh0LCAmbV9zdXJmYWNlLCAmbV9zdXJmYWNl T3duZXIpOwogICAgICAgICBpZiAoIW1fc3VyZmFjZSkKICAgICAgICAgICAgIHJldHVybjsKIApA QCAtMTM3LDYgKzEzOSw3IEBAIEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6R3JhcGhpY3NDb250 ZXh0M0RQcml2YXRlKEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0LCBICiAgICAgd2luZG93LT5z ZXRHZW9tZXRyeSgtMTAsIC0xMCwgMSwgMSk7CiAgICAgd2luZG93LT5jcmVhdGUoKTsKICAgICBt X3N1cmZhY2UgPSB3aW5kb3c7CisgICAgbV9zdXJmYWNlT3duZXIgPSB3aW5kb3c7CiAKICAgICBt X3BsYXRmb3JtQ29udGV4dCA9IG5ldyBRT3BlbkdMQ29udGV4dCh3aW5kb3cpOwogICAgIGlmICgh bV9wbGF0Zm9ybUNvbnRleHQtPmNyZWF0ZSgpKQpAQCAtMjA4LDEyICsyMTEsOCBAQCB2b2lkIEdy YXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6aW5pdGlhbGl6ZUFOR0xFKCkKIAogR3JhcGhpY3NDb250 ZXh0M0RQcml2YXRlOjp+R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlKCkKIHsKLSAgICBpZiAobV9o b3N0V2luZG93KSB7Ci0gICAgICAgIGRlbGV0ZSBtX3N1cmZhY2U7Ci0gICAgICAgIG1fc3VyZmFj ZSA9IDA7Ci0gICAgICAgIC8vIFBsYXRmb3JtIGNvbnRleHQgaXMgYXNzdW1lZCB0byBiZSBvd25l ZCBieSBzdXJmYWNlLgotICAgICAgICBtX3BsYXRmb3JtQ29udGV4dCA9IDA7Ci0gICAgfQorICAg IGRlbGV0ZSBtX3N1cmZhY2VPd25lcjsKKyAgICBtX3N1cmZhY2VPd25lciA9IDA7CiB9CiAKIHN0 YXRpYyBpbmxpbmUgcXVpbnQzMiBzd2FwQmdyVG9SZ2IocXVpbnQzMiBwaXhlbCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1FXZWJQYWdlQ2xpZW50LmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9xdC9RV2ViUGFnZUNsaWVudC5oCmluZGV4IGFkZWY3ZmYuLmI0YzQ2 NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1FXZWJQYWdlQ2xpZW50 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUVdlYlBhZ2VDbGllbnQuaApAQCAt MTA4LDcgKzEwOCw4IEBAIHB1YmxpYzoKIAogI2lmIFVTRSgzRF9HUkFQSElDUykKICAgICB2aXJ0 dWFsIHZvaWQgY3JlYXRlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQzRChQbGF0Zm9ybUdyYXBoaWNz Q29udGV4dDNEKiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBQbGF0Zm9ybUdyYXBoaWNzU3VyZmFjZTNEKikgPSAwOworICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBsYXRmb3JtR3JhcGhpY3NTdXJmYWNlM0Qq LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBsYXRm b3JtR3JhcGhpY3NXaW5kb3czRCogPSAwKSA9IDA7CiAjZW5kaWYKICAgICB2aXJ0dWFsIFFXaW5k b3cqIG93bmVyV2luZG93KCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggMmYxNTlmNi4uOWM1 OTkxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMi0wOS0xMSAgUm9sYW5k IFRha2FjcyAgPHJ0YWthY3NAaW5mLnUtc3plZ2VkLmh1PgorCisgICAgICAgIFtRdF0gU2VnbWVu dGF0aW9uIGZhdWx0IHdoZW4gY2xvc2luZyBRdFRlc3RCcm93c2VyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTAwMworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERlZmluZWQgYSBuZXcgUGxhdGZvcm1HcmFw aGljc1dpbmRvdzNEIChRT2JqZWN0KikgdmFyaWFibGUgdGhhdCBwb2ludHMgdG8KKyAgICAgICAg dGhlIFFHTFdpZGdldCB0aGF0IHdhcyBjcmVhdGVkIGluICdjcmVhdGVQbGF0Zm9ybUdyYXBoaWNz Q29udGV4dDNERnJvbVdpZGdldCcuCisgICAgICAgIEl0IGlzIG5lY2Nlc3NhcnkgZm9yIGRlYWxs b2NhdGluZyBpdC4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5jcHA6 CisgICAgICAgIChjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNERnJvbVdpZGdldCk6Cisg ICAgICAgIChXZWJDb3JlOjpQYWdlQ2xpZW50UVdpZGdldDo6Y3JlYXRlUGxhdGZvcm1HcmFwaGlj c0NvbnRleHQzRCk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0 OjpjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKToKKyAgICAgICAgKiBXZWJDb3JlU3Vw cG9ydC9QYWdlQ2xpZW50UXQuaDoKKyAgICAgICAgKFBhZ2VDbGllbnRRV2lkZ2V0KToKKyAgICAg ICAgKFBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQpOgorCiAyMDEyLTA5LTExICBUb3IgQXJuZSBW ZXN0YsO4ICA8dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIEFkZCBh IGNvbmZpZ3VyZSBzdGVwIHRvIHRoZSBRdCBidWlsZCBzeXN0ZW0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvUGFnZUNsaWVudFF0LmNwcCBiL1NvdXJjZS9XZWJL aXQvcXQvV2ViQ29yZVN1cHBvcnQvUGFnZUNsaWVudFF0LmNwcAppbmRleCAwMDkzMTg3Li4zMjEz NDMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1BhZ2VDbGll bnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50 UXQuY3BwCkBAIC0zNiwxMSArMzYsMTMgQEAKICNpbmNsdWRlIDxRV2luZG93PgogCiBzdGF0aWMg dm9pZCBjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNERnJvbVdpZGdldChRV2lkZ2V0KiB3 aWRnZXQsIFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQbGF0Zm9ybUdyYXBoaWNz U3VyZmFjZTNEKiBzdXJmYWNlKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgUGxhdGZvcm1HcmFwaGljc1N1cmZhY2UzRCogc3VyZmFjZSwgUGxh dGZvcm1HcmFwaGljc1dpbmRvdzNEKiBzdXJmYWNlT3duZXIpCiB7CiAjaWZkZWYgUVRfT1BFTkdM X0xJQgogICAgICpjb250ZXh0ID0gMDsKICAgICAqc3VyZmFjZSA9IDA7CisgICAgaWYgKHN1cmZh Y2VPd25lcikKKyAgICAgICAgKnN1cmZhY2VPd25lciA9IDA7CiAgICAgUUFic3RyYWN0U2Nyb2xs QXJlYSogc2Nyb2xsQXJlYSA9IHFvYmplY3RfY2FzdDxRQWJzdHJhY3RTY3JvbGxBcmVhKj4od2lk Z2V0KTsKICAgICBpZiAoIXNjcm9sbEFyZWEpCiAgICAgICAgIHJldHVybjsKQEAgLTUyLDYgKzU0 LDggQEAgc3RhdGljIHZvaWQgY3JlYXRlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQzREZyb21XaWRn ZXQoUVdpZGdldCogd2lkZ2V0LCBQbGF0Zm9ybUcKICAgICBpZiAoZ2xXaWRnZXQtPmlzVmFsaWQo KSkgewogICAgICAgICAvLyBHZW9tZXRyeSBjYW4gYmUgc2V0IHRvIHplcm8gYmVjYXVzZSBtX2ds V2lkZ2V0IGlzIHVzZWQgb25seSBmb3IgaXRzIFFHTENvbnRleHQuCiAgICAgICAgIGdsV2lkZ2V0 LT5zZXRHZW9tZXRyeSgwLCAwLCAwLCAwKTsKKyAgICAgICAgaWYgKHN1cmZhY2VPd25lcikKKyAg ICAgICAgICAgICpzdXJmYWNlT3duZXIgPSBnbFdpZGdldDsKICAgICAgICAgKnN1cmZhY2UgPSBn bFdpZGdldC0+d2luZG93SGFuZGxlKCk7CiAgICAgICAgICpjb250ZXh0ID0gZ2xXaWRnZXQtPmNv bnRleHQoKS0+Y29udGV4dEhhbmRsZSgpOwogICAgIH0gZWxzZSB7CkBAIC0yMzUsOSArMjM5LDEw IEBAIHZvaWQgUGFnZUNsaWVudFFXaWRnZXQ6OnNldFdpZGdldFZpc2libGUoV2lkZ2V0KiB3aWRn ZXQsIGJvb2wgdmlzaWJsZSkKIAogI2lmIFVTRSgzRF9HUkFQSElDUykKIHZvaWQgUGFnZUNsaWVu dFFXaWRnZXQ6OmNyZWF0ZVBsYXRmb3JtR3JhcGhpY3NDb250ZXh0M0QoUGxhdGZvcm1HcmFwaGlj c0NvbnRleHQzRCogY29udGV4dCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgUGxhdGZvcm1HcmFwaGljc1N1cmZhY2UzRCogc3VyZmFjZSkK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg UGxhdGZvcm1HcmFwaGljc1N1cmZhY2UzRCogc3VyZmFjZSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUGxhdGZvcm1HcmFwaGljc1dpbmRv dzNEKiBzdXJmYWNlT3duZXIpCiB7Ci0gICAgY3JlYXRlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQz REZyb21XaWRnZXQodmlldywgY29udGV4dCwgc3VyZmFjZSk7CisgICAgY3JlYXRlUGxhdGZvcm1H cmFwaGljc0NvbnRleHQzREZyb21XaWRnZXQodmlldywgY29udGV4dCwgc3VyZmFjZSwgc3VyZmFj ZU93bmVyKTsKIH0KICNlbmRpZgogCkBAIC00MjQsOSArNDI5LDEwIEBAIFFSZWN0RiBQYWdlQ2xp ZW50UUdyYXBoaWNzV2lkZ2V0Ojp3aW5kb3dSZWN0KCkgY29uc3QKIAogI2lmIFVTRSgzRF9HUkFQ SElDUykKIHZvaWQgUGFnZUNsaWVudFFHcmFwaGljc1dpZGdldDo6Y3JlYXRlUGxhdGZvcm1HcmFw aGljc0NvbnRleHQzRChQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0LAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFBsYXRmb3JtR3JhcGhpY3NTdXJmYWNlM0QqIHN1cmZhY2UpCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUGxhdGZvcm1HcmFw aGljc1N1cmZhY2UzRCogc3VyZmFjZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQbGF0Zm9ybUdyYXBoaWNzV2luZG93M0Qq IHN1cmZhY2VPd25lcikKIHsKLSAgICBjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNERnJv bVdpZGdldChvd25lcldpZGdldCgpLCBjb250ZXh0LCBzdXJmYWNlKTsKKyAgICBjcmVhdGVQbGF0 Zm9ybUdyYXBoaWNzQ29udGV4dDNERnJvbVdpZGdldChvd25lcldpZGdldCgpLCBjb250ZXh0LCBz dXJmYWNlLCBzdXJmYWNlT3duZXIpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvUGFnZUNsaWVudFF0LmggYi9Tb3VyY2UvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5oCmluZGV4IGZlYmNhMDMuLjJlZjA3MmUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvUGFnZUNsaWVudFF0LmgK KysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50UXQuaApAQCAt MTAxLDcgKzEwMSw4IEBAIHB1YmxpYzoKIAogI2lmIFVTRSgzRF9HUkFQSElDUykKICAgICB2aXJ0 dWFsIHZvaWQgY3JlYXRlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQzRChQbGF0Zm9ybUdyYXBoaWNz Q29udGV4dDNEKiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBQbGF0Zm9ybUdyYXBoaWNzU3VyZmFjZTNEKik7CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgUGxhdGZvcm1HcmFwaGljc1N1cmZhY2UzRCosCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUGxhdGZvcm1H cmFwaGljc1dpbmRvdzNEKik7CiAjZW5kaWYKIAogICAgIFFXaWRnZXQqIHZpZXc7CkBAIC0yMDks NyArMjEwLDggQEAgcHVibGljOgogCiAjaWYgVVNFKDNEX0dSQVBISUNTKQogICAgIHZpcnR1YWwg dm9pZCBjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKFBsYXRmb3JtR3JhcGhpY3NDb250 ZXh0M0QqLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFBsYXRmb3JtR3JhcGhpY3NTdXJmYWNlM0QqKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBQbGF0Zm9ybUdyYXBoaWNzU3VyZmFjZTNEKiwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQbGF0Zm9ybUdyYXBo aWNzV2luZG93M0QqKTsKICNlbmRpZgogCiAjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCg== 163552 2012-09-12 02:00:34 -0700 2012-09-12 07:46:28 -0700 patch 2012_09_12.diff text/plain 8481 rtakacs ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhMjNmMWU1Li4xOTg2MTkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTItMDktMTIgIFJvbGFuZCBUYWthY3MgIDxydGFrYWNzQGluZi51LXN6ZWdlZC5odT4K KworICAgICAgICBbUXRdIFNlZ21lbnRhdGlvbiBmYXVsdCB3aGVuIGNsb3NpbmcgUXRUZXN0QnJv d3NlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTUw MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEZWZp bmVkIGEgbmV3IFFPYmplY3QqIHZhcmlhYmxlLgorICAgICAgICBJZiBXZWJLaXQxIGlzIHVzZWQs IGl0IHBvaW50cyB0byB0aGUgUUdMV2lkZ2V0IHRoYXQgd2FzIAorICAgICAgICBjcmVhdGVkIGlu ICdjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNERnJvbVdpZGdldCcuCisgICAgICAgIElm IFdlYktpdDIgaXMgdXNlZCwgaXQgcG9pbnRzIHRvIHRoZSBRV2luZG93IHRoYXQgd2FzIAorICAg ICAgICBjcmVhdGVkIGluIEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZSdzIGNvbnN0cnVjdG9yLgor ICAgICAgICBJdCBpcyBuZWNjZXNzYXJ5IGZvciBkZWFsbG9jYXRpbmcgdGhlbS4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dDNEUXQuY3BwOgorICAgICAg ICAoR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dDNEUHJpdmF0ZTo6R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlKToKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6fkdyYXBoaWNzQ29udGV4dDNEUHJpdmF0 ZSk6CisgICAgICAgICogcGxhdGZvcm0vcXQvUVdlYlBhZ2VDbGllbnQuaDoKKyAgICAgICAgKFFX ZWJQYWdlQ2xpZW50KToKKwogMjAxMi0wOS0xMSAgTWlobmVhIE92aWRlbmllICA8bWlobmVhQGFk b2JlLmNvbT4KIAogICAgICAgICBbQ1NTIFJlZ2lvbnNdIEF1dG8gd2lkdGggaXMgbm90IHdvcmtp bmcgZm9yIFJlZ2lvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3F0L0dyYXBoaWNzQ29udGV4dDNEUXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0M0RRdC5jcHAKaW5kZXggOThhZGVjNy4uYjRjNGMw ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhp Y3NDb250ZXh0M0RRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv cXQvR3JhcGhpY3NDb250ZXh0M0RRdC5jcHAKQEAgLTg0LDYgKzg0LDcgQEAgcHVibGljOgogICAg IEhvc3RXaW5kb3cqIG1faG9zdFdpbmRvdzsKICAgICBQbGF0Zm9ybUdyYXBoaWNzU3VyZmFjZTNE IG1fc3VyZmFjZTsKICAgICBQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEIG1fcGxhdGZvcm1Db250 ZXh0OworICAgIFFPYmplY3QqIG1fc3VyZmFjZU93bmVyOwogI2lmIFVTRShHUkFQSElDU19TVVJG QUNFKQogICAgIEdyYXBoaWNzU3VyZmFjZTo6RmxhZ3MgbV9zdXJmYWNlRmxhZ3M7CiAgICAgUmVm UHRyPEdyYXBoaWNzU3VyZmFjZT4gbV9ncmFwaGljc1N1cmZhY2U7CkBAIC0xMTEsMTEgKzExMiwx MiBAQCBHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OkdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZShH cmFwaGljc0NvbnRleHQzRCogY29udGV4dCwgSAogICAgICwgbV9ob3N0V2luZG93KGhvc3RXaW5k b3cpCiAgICAgLCBtX3N1cmZhY2UoMCkKICAgICAsIG1fcGxhdGZvcm1Db250ZXh0KDApCisgICAg LCBtX3N1cmZhY2VPd25lcigwKQogewogICAgIGlmIChtX2hvc3RXaW5kb3cgJiYgbV9ob3N0V2lu ZG93LT5wbGF0Zm9ybVBhZ2VDbGllbnQoKSkgewogICAgICAgICAvLyBUaGlzIGlzIHRoZSBXZWJL aXQxIGNvZGUgcGF0aC4KICAgICAgICAgUVdlYlBhZ2VDbGllbnQqIHdlYlBhZ2VDbGllbnQgPSBt X2hvc3RXaW5kb3ctPnBsYXRmb3JtUGFnZUNsaWVudCgpOwotICAgICAgICB3ZWJQYWdlQ2xpZW50 LT5jcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKCZtX3BsYXRmb3JtQ29udGV4dCwgJm1f c3VyZmFjZSk7CisgICAgICAgIHdlYlBhZ2VDbGllbnQtPmNyZWF0ZVBsYXRmb3JtR3JhcGhpY3ND b250ZXh0M0QoJm1fcGxhdGZvcm1Db250ZXh0LCAmbV9zdXJmYWNlLCBtX3N1cmZhY2VPd25lcik7 CiAgICAgICAgIGlmICghbV9zdXJmYWNlKQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0xMzcs NiArMTM5LDcgQEAgR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpHcmFwaGljc0NvbnRleHQzRFBy aXZhdGUoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQsIEgKICAgICB3aW5kb3ctPnNldEdlb21l dHJ5KC0xMCwgLTEwLCAxLCAxKTsKICAgICB3aW5kb3ctPmNyZWF0ZSgpOwogICAgIG1fc3VyZmFj ZSA9IHdpbmRvdzsKKyAgICBtX3N1cmZhY2VPd25lciA9IHdpbmRvdzsKIAogICAgIG1fcGxhdGZv cm1Db250ZXh0ID0gbmV3IFFPcGVuR0xDb250ZXh0KHdpbmRvdyk7CiAgICAgaWYgKCFtX3BsYXRm b3JtQ29udGV4dC0+Y3JlYXRlKCkpCkBAIC0yMDgsMTIgKzIxMSw4IEBAIHZvaWQgR3JhcGhpY3ND b250ZXh0M0RQcml2YXRlOjppbml0aWFsaXplQU5HTEUoKQogCiBHcmFwaGljc0NvbnRleHQzRFBy aXZhdGU6On5HcmFwaGljc0NvbnRleHQzRFByaXZhdGUoKQogewotICAgIGlmIChtX2hvc3RXaW5k b3cpIHsKLSAgICAgICAgZGVsZXRlIG1fc3VyZmFjZTsKLSAgICAgICAgbV9zdXJmYWNlID0gMDsK LSAgICAgICAgLy8gUGxhdGZvcm0gY29udGV4dCBpcyBhc3N1bWVkIHRvIGJlIG93bmVkIGJ5IHN1 cmZhY2UuCi0gICAgICAgIG1fcGxhdGZvcm1Db250ZXh0ID0gMDsKLSAgICB9CisgICAgZGVsZXRl IG1fc3VyZmFjZU93bmVyOworICAgIG1fc3VyZmFjZU93bmVyID0gMDsKIH0KIAogc3RhdGljIGlu bGluZSBxdWludDMyIHN3YXBCZ3JUb1JnYihxdWludDMyIHBpeGVsKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUVdlYlBhZ2VDbGllbnQuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL3F0L1FXZWJQYWdlQ2xpZW50LmgKaW5kZXggYWRlZjdmZi4uNDdiZmRjOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUVdlYlBhZ2VDbGllbnQuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9RV2ViUGFnZUNsaWVudC5oCkBAIC0xMDgsNyAr MTA4LDggQEAgcHVibGljOgogCiAjaWYgVVNFKDNEX0dSQVBISUNTKQogICAgIHZpcnR1YWwgdm9p ZCBjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0 M0QqLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBs YXRmb3JtR3JhcGhpY3NTdXJmYWNlM0QqKSA9IDA7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgUGxhdGZvcm1HcmFwaGljc1N1cmZhY2UzRCosCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUU9iamVjdCogPSAw KSA9IDA7CiAjZW5kaWYKICAgICB2aXJ0dWFsIFFXaW5kb3cqIG93bmVyV2luZG93KCkgY29uc3Q7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dC9xdC9DaGFuZ2VMb2cKaW5kZXggMWFlNDNjNy4uZDNmYWVkYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMiBAQAorMjAxMi0wOS0xMiAgUm9sYW5kIFRha2FjcyAgPHJ0YWthY3NAaW5mLnUt c3plZ2VkLmh1PgorCisgICAgICAgIFtRdF0gU2VnbWVudGF0aW9uIGZhdWx0IHdoZW4gY2xvc2lu ZyBRdFRlc3RCcm93c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05NTAwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIERlZmluZWQgYSBuZXcgUU9iamVjdCogdmFyaWFibGUgdGhhdCBwb2ludHMgdG8gdGhl IFFHTFdpZGdldCB0aGF0IHdhcyBjcmVhdGVkCisgICAgICAgIGluICdjcmVhdGVQbGF0Zm9ybUdy YXBoaWNzQ29udGV4dDNERnJvbVdpZGdldCcuCisgICAgICAgIEl0IGlzIG5lY2Nlc3NhcnkgZm9y IGRlYWxsb2NhdGluZyBpdC4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1BhZ2VDbGllbnRR dC5jcHA6CisgICAgICAgIChjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNERnJvbVdpZGdl dCk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ2xpZW50UVdpZGdldDo6Y3JlYXRlUGxhdGZvcm1H cmFwaGljc0NvbnRleHQzRCk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ2xpZW50UUdyYXBoaWNz V2lkZ2V0OjpjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKToKKyAgICAgICAgKiBXZWJD b3JlU3VwcG9ydC9QYWdlQ2xpZW50UXQuaDoKKyAgICAgICAgKFBhZ2VDbGllbnRRV2lkZ2V0KToK KyAgICAgICAgKFBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQpOgorCiAyMDEyLTA5LTA5ICBFbWls IEEgRWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZW5hbWUgTm9kZTo6Z2V0 UmVjdC9nZXRQaXhlbFNuYXBwZWRSZWN0IGFuZCByZW1vdmUgQ29udGFpbmVyTm9kZTo6Z2V0UmVj dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50 UXQuY3BwIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50UXQuY3Bw CmluZGV4IDAwOTMxODcuLjg3MDI5MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2Vi Q29yZVN1cHBvcnQvUGFnZUNsaWVudFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNv cmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5jcHAKQEAgLTM2LDExICszNiwxMyBAQAogI2luY2x1ZGUg PFFXaW5kb3c+CiAKIHN0YXRpYyB2b2lkIGNyZWF0ZVBsYXRmb3JtR3JhcGhpY3NDb250ZXh0M0RG cm9tV2lkZ2V0KFFXaWRnZXQqIHdpZGdldCwgUGxhdGZvcm1HcmFwaGljc0NvbnRleHQzRCogY29u dGV4dCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFBsYXRmb3JtR3JhcGhpY3NTdXJmYWNlM0QqIHN1cmZhY2UpCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQbGF0Zm9ybUdyYXBoaWNzU3Vy ZmFjZTNEKiBzdXJmYWNlLCBRT2JqZWN0KiBzdXJmYWNlT3duZXIpCiB7CiAjaWZkZWYgUVRfT1BF TkdMX0xJQgogICAgICpjb250ZXh0ID0gMDsKICAgICAqc3VyZmFjZSA9IDA7CisgICAgaWYgKHN1 cmZhY2VPd25lcikKKyAgICAgICAgc3VyZmFjZU93bmVyID0gMDsKICAgICBRQWJzdHJhY3RTY3Jv bGxBcmVhKiBzY3JvbGxBcmVhID0gcW9iamVjdF9jYXN0PFFBYnN0cmFjdFNjcm9sbEFyZWEqPih3 aWRnZXQpOwogICAgIGlmICghc2Nyb2xsQXJlYSkKICAgICAgICAgcmV0dXJuOwpAQCAtNTIsNiAr NTQsOCBAQCBzdGF0aWMgdm9pZCBjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNERnJvbVdp ZGdldChRV2lkZ2V0KiB3aWRnZXQsIFBsYXRmb3JtRwogICAgIGlmIChnbFdpZGdldC0+aXNWYWxp ZCgpKSB7CiAgICAgICAgIC8vIEdlb21ldHJ5IGNhbiBiZSBzZXQgdG8gemVybyBiZWNhdXNlIG1f Z2xXaWRnZXQgaXMgdXNlZCBvbmx5IGZvciBpdHMgUUdMQ29udGV4dC4KICAgICAgICAgZ2xXaWRn ZXQtPnNldEdlb21ldHJ5KDAsIDAsIDAsIDApOworICAgICAgICBpZiAoc3VyZmFjZU93bmVyKQor ICAgICAgICAgICAgc3VyZmFjZU93bmVyID0gZ2xXaWRnZXQ7CiAgICAgICAgICpzdXJmYWNlID0g Z2xXaWRnZXQtPndpbmRvd0hhbmRsZSgpOwogICAgICAgICAqY29udGV4dCA9IGdsV2lkZ2V0LT5j b250ZXh0KCktPmNvbnRleHRIYW5kbGUoKTsKICAgICB9IGVsc2UgewpAQCAtMjM1LDkgKzIzOSwx MCBAQCB2b2lkIFBhZ2VDbGllbnRRV2lkZ2V0OjpzZXRXaWRnZXRWaXNpYmxlKFdpZGdldCogd2lk Z2V0LCBib29sIHZpc2libGUpCiAKICNpZiBVU0UoM0RfR1JBUEhJQ1MpCiB2b2lkIFBhZ2VDbGll bnRRV2lkZ2V0OjpjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKFBsYXRmb3JtR3JhcGhp Y3NDb250ZXh0M0QqIGNvbnRleHQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFBsYXRmb3JtR3JhcGhpY3NTdXJmYWNlM0QqIHN1cmZhY2Up CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFBsYXRmb3JtR3JhcGhpY3NTdXJmYWNlM0QqIHN1cmZhY2UsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFFPYmplY3QqIHN1cmZhY2VPd25l cikKIHsKLSAgICBjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNERnJvbVdpZGdldCh2aWV3 LCBjb250ZXh0LCBzdXJmYWNlKTsKKyAgICBjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNE RnJvbVdpZGdldCh2aWV3LCBjb250ZXh0LCBzdXJmYWNlLCBzdXJmYWNlT3duZXIpOwogfQogI2Vu ZGlmCiAKQEAgLTQyNCw5ICs0MjksMTAgQEAgUVJlY3RGIFBhZ2VDbGllbnRRR3JhcGhpY3NXaWRn ZXQ6OndpbmRvd1JlY3QoKSBjb25zdAogCiAjaWYgVVNFKDNEX0dSQVBISUNTKQogdm9pZCBQYWdl Q2xpZW50UUdyYXBoaWNzV2lkZ2V0OjpjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKFBs YXRmb3JtR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUGxhdGZvcm1HcmFwaGlj c1N1cmZhY2UzRCogc3VyZmFjZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQbGF0Zm9ybUdyYXBoaWNzU3VyZmFjZTNEKiBz dXJmYWNlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFFPYmplY3QqIHN1cmZhY2VPd25lcikKIHsKLSAgICBjcmVhdGVQbGF0 Zm9ybUdyYXBoaWNzQ29udGV4dDNERnJvbVdpZGdldChvd25lcldpZGdldCgpLCBjb250ZXh0LCBz dXJmYWNlKTsKKyAgICBjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNERnJvbVdpZGdldChv d25lcldpZGdldCgpLCBjb250ZXh0LCBzdXJmYWNlLCBzdXJmYWNlT3duZXIpOwogfQogI2VuZGlm CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvUGFnZUNsaWVu dFF0LmggYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5oCmlu ZGV4IGZlYmNhMDMuLjFkMDg1ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29y ZVN1cHBvcnQvUGFnZUNsaWVudFF0LmgKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3Vw cG9ydC9QYWdlQ2xpZW50UXQuaApAQCAtMTAxLDcgKzEwMSw4IEBAIHB1YmxpYzoKIAogI2lmIFVT RSgzRF9HUkFQSElDUykKICAgICB2aXJ0dWFsIHZvaWQgY3JlYXRlUGxhdGZvcm1HcmFwaGljc0Nv bnRleHQzRChQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKiwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQbGF0Zm9ybUdyYXBoaWNzU3VyZmFjZTNEKik7 CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUGxhdGZv cm1HcmFwaGljc1N1cmZhY2UzRCosCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgUU9iamVjdCopOwogI2VuZGlmCiAKICAgICBRV2lkZ2V0KiB2aWV3OwpA QCAtMjA5LDcgKzIxMCw4IEBAIHB1YmxpYzoKIAogI2lmIFVTRSgzRF9HUkFQSElDUykKICAgICB2 aXJ0dWFsIHZvaWQgY3JlYXRlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQzRChQbGF0Zm9ybUdyYXBo aWNzQ29udGV4dDNEKiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBQbGF0Zm9ybUdyYXBoaWNzU3VyZmFjZTNEKik7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUGxhdGZvcm1HcmFwaGljc1N1cmZhY2UzRCos CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUU9iamVj dCopOwogI2VuZGlmCiAKICNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkK 163626 2012-09-12 07:46:28 -0700 2012-09-12 08:36:22 -0700 patch 2012_09_12_3.diff text/plain 8490 rtakacs ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhMjNmMWU1Li4xOTg2MTkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTItMDktMTIgIFJvbGFuZCBUYWthY3MgIDxydGFrYWNzQGluZi51LXN6ZWdlZC5odT4K KworICAgICAgICBbUXRdIFNlZ21lbnRhdGlvbiBmYXVsdCB3aGVuIGNsb3NpbmcgUXRUZXN0QnJv d3NlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTUw MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEZWZp bmVkIGEgbmV3IFFPYmplY3QqIHZhcmlhYmxlLgorICAgICAgICBJZiBXZWJLaXQxIGlzIHVzZWQs IGl0IHBvaW50cyB0byB0aGUgUUdMV2lkZ2V0IHRoYXQgd2FzIAorICAgICAgICBjcmVhdGVkIGlu ICdjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNERnJvbVdpZGdldCcuCisgICAgICAgIElm IFdlYktpdDIgaXMgdXNlZCwgaXQgcG9pbnRzIHRvIHRoZSBRV2luZG93IHRoYXQgd2FzIAorICAg ICAgICBjcmVhdGVkIGluIEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZSdzIGNvbnN0cnVjdG9yLgor ICAgICAgICBJdCBpcyBuZWNjZXNzYXJ5IGZvciBkZWFsbG9jYXRpbmcgdGhlbS4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dDNEUXQuY3BwOgorICAgICAg ICAoR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dDNEUHJpdmF0ZTo6R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlKToKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6fkdyYXBoaWNzQ29udGV4dDNEUHJpdmF0 ZSk6CisgICAgICAgICogcGxhdGZvcm0vcXQvUVdlYlBhZ2VDbGllbnQuaDoKKyAgICAgICAgKFFX ZWJQYWdlQ2xpZW50KToKKwogMjAxMi0wOS0xMSAgTWlobmVhIE92aWRlbmllICA8bWlobmVhQGFk b2JlLmNvbT4KIAogICAgICAgICBbQ1NTIFJlZ2lvbnNdIEF1dG8gd2lkdGggaXMgbm90IHdvcmtp bmcgZm9yIFJlZ2lvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3F0L0dyYXBoaWNzQ29udGV4dDNEUXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0M0RRdC5jcHAKaW5kZXggOThhZGVjNy4uMTY3OGM0 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhp Y3NDb250ZXh0M0RRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv cXQvR3JhcGhpY3NDb250ZXh0M0RRdC5jcHAKQEAgLTg0LDYgKzg0LDcgQEAgcHVibGljOgogICAg IEhvc3RXaW5kb3cqIG1faG9zdFdpbmRvdzsKICAgICBQbGF0Zm9ybUdyYXBoaWNzU3VyZmFjZTNE IG1fc3VyZmFjZTsKICAgICBQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEIG1fcGxhdGZvcm1Db250 ZXh0OworICAgIFFPYmplY3QqIG1fc3VyZmFjZU93bmVyOwogI2lmIFVTRShHUkFQSElDU19TVVJG QUNFKQogICAgIEdyYXBoaWNzU3VyZmFjZTo6RmxhZ3MgbV9zdXJmYWNlRmxhZ3M7CiAgICAgUmVm UHRyPEdyYXBoaWNzU3VyZmFjZT4gbV9ncmFwaGljc1N1cmZhY2U7CkBAIC0xMTEsMTEgKzExMiwx MiBAQCBHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OkdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZShH cmFwaGljc0NvbnRleHQzRCogY29udGV4dCwgSAogICAgICwgbV9ob3N0V2luZG93KGhvc3RXaW5k b3cpCiAgICAgLCBtX3N1cmZhY2UoMCkKICAgICAsIG1fcGxhdGZvcm1Db250ZXh0KDApCisgICAg LCBtX3N1cmZhY2VPd25lcigwKQogewogICAgIGlmIChtX2hvc3RXaW5kb3cgJiYgbV9ob3N0V2lu ZG93LT5wbGF0Zm9ybVBhZ2VDbGllbnQoKSkgewogICAgICAgICAvLyBUaGlzIGlzIHRoZSBXZWJL aXQxIGNvZGUgcGF0aC4KICAgICAgICAgUVdlYlBhZ2VDbGllbnQqIHdlYlBhZ2VDbGllbnQgPSBt X2hvc3RXaW5kb3ctPnBsYXRmb3JtUGFnZUNsaWVudCgpOwotICAgICAgICB3ZWJQYWdlQ2xpZW50 LT5jcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKCZtX3BsYXRmb3JtQ29udGV4dCwgJm1f c3VyZmFjZSk7CisgICAgICAgIHdlYlBhZ2VDbGllbnQtPmNyZWF0ZVBsYXRmb3JtR3JhcGhpY3ND b250ZXh0M0QoJm1fcGxhdGZvcm1Db250ZXh0LCAmbV9zdXJmYWNlLCAmbV9zdXJmYWNlT3duZXIp OwogICAgICAgICBpZiAoIW1fc3VyZmFjZSkKICAgICAgICAgICAgIHJldHVybjsKIApAQCAtMTM3 LDYgKzEzOSw3IEBAIEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6R3JhcGhpY3NDb250ZXh0M0RQ cml2YXRlKEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0LCBICiAgICAgd2luZG93LT5zZXRHZW9t ZXRyeSgtMTAsIC0xMCwgMSwgMSk7CiAgICAgd2luZG93LT5jcmVhdGUoKTsKICAgICBtX3N1cmZh Y2UgPSB3aW5kb3c7CisgICAgbV9zdXJmYWNlT3duZXIgPSB3aW5kb3c7CiAKICAgICBtX3BsYXRm b3JtQ29udGV4dCA9IG5ldyBRT3BlbkdMQ29udGV4dCh3aW5kb3cpOwogICAgIGlmICghbV9wbGF0 Zm9ybUNvbnRleHQtPmNyZWF0ZSgpKQpAQCAtMjA4LDEyICsyMTEsOCBAQCB2b2lkIEdyYXBoaWNz Q29udGV4dDNEUHJpdmF0ZTo6aW5pdGlhbGl6ZUFOR0xFKCkKIAogR3JhcGhpY3NDb250ZXh0M0RQ cml2YXRlOjp+R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlKCkKIHsKLSAgICBpZiAobV9ob3N0V2lu ZG93KSB7Ci0gICAgICAgIGRlbGV0ZSBtX3N1cmZhY2U7Ci0gICAgICAgIG1fc3VyZmFjZSA9IDA7 Ci0gICAgICAgIC8vIFBsYXRmb3JtIGNvbnRleHQgaXMgYXNzdW1lZCB0byBiZSBvd25lZCBieSBz dXJmYWNlLgotICAgICAgICBtX3BsYXRmb3JtQ29udGV4dCA9IDA7Ci0gICAgfQorICAgIGRlbGV0 ZSBtX3N1cmZhY2VPd25lcjsKKyAgICBtX3N1cmZhY2VPd25lciA9IDA7CiB9CiAKIHN0YXRpYyBp bmxpbmUgcXVpbnQzMiBzd2FwQmdyVG9SZ2IocXVpbnQzMiBwaXhlbCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1FXZWJQYWdlQ2xpZW50LmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9xdC9RV2ViUGFnZUNsaWVudC5oCmluZGV4IGFkZWY3ZmYuLmNkYTBiMGYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1FXZWJQYWdlQ2xpZW50LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUVdlYlBhZ2VDbGllbnQuaApAQCAtMTA4LDcg KzEwOCw4IEBAIHB1YmxpYzoKIAogI2lmIFVTRSgzRF9HUkFQSElDUykKICAgICB2aXJ0dWFsIHZv aWQgY3JlYXRlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQzRChQbGF0Zm9ybUdyYXBoaWNzQ29udGV4 dDNEKiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQ bGF0Zm9ybUdyYXBoaWNzU3VyZmFjZTNEKikgPSAwOworICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFBsYXRmb3JtR3JhcGhpY3NTdXJmYWNlM0QqLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFFPYmplY3QqKiA9 IDApID0gMDsKICNlbmRpZgogICAgIHZpcnR1YWwgUVdpbmRvdyogb3duZXJXaW5kb3coKSBjb25z dDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L3F0L0NoYW5nZUxvZwppbmRleCAxYWU0M2M3Li5kM2ZhZWRiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwpA QCAtMSwzICsxLDIyIEBACisyMDEyLTA5LTEyICBSb2xhbmQgVGFrYWNzICA8cnRha2Fjc0BpbmYu dS1zemVnZWQuaHU+CisKKyAgICAgICAgW1F0XSBTZWdtZW50YXRpb24gZmF1bHQgd2hlbiBjbG9z aW5nIFF0VGVzdEJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTk1MDAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRGVmaW5lZCBhIG5ldyBRT2JqZWN0KiB2YXJpYWJsZSB0aGF0IHBvaW50cyB0byB0 aGUgUUdMV2lkZ2V0IHRoYXQgd2FzIGNyZWF0ZWQKKyAgICAgICAgaW4gJ2NyZWF0ZVBsYXRmb3Jt R3JhcGhpY3NDb250ZXh0M0RGcm9tV2lkZ2V0Jy4KKyAgICAgICAgSXQgaXMgbmVjY2Vzc2FyeSBm b3IgZGVhbGxvY2F0aW5nIGl0LgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvUGFnZUNsaWVu dFF0LmNwcDoKKyAgICAgICAgKGNyZWF0ZVBsYXRmb3JtR3JhcGhpY3NDb250ZXh0M0RGcm9tV2lk Z2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VDbGllbnRRV2lkZ2V0OjpjcmVhdGVQbGF0Zm9y bUdyYXBoaWNzQ29udGV4dDNEKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VDbGllbnRRR3JhcGhp Y3NXaWRnZXQ6OmNyZWF0ZVBsYXRmb3JtR3JhcGhpY3NDb250ZXh0M0QpOgorICAgICAgICAqIFdl YkNvcmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5oOgorICAgICAgICAoUGFnZUNsaWVudFFXaWRnZXQp OgorICAgICAgICAoUGFnZUNsaWVudFFHcmFwaGljc1dpZGdldCk6CisKIDIwMTItMDktMDkgIEVt aWwgQSBFa2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlbmFtZSBOb2RlOjpn ZXRSZWN0L2dldFBpeGVsU25hcHBlZFJlY3QgYW5kIHJlbW92ZSBDb250YWluZXJOb2RlOjpnZXRS ZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1BhZ2VDbGll bnRRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5j cHAKaW5kZXggMDA5MzE4Ny4uMmJlMWIzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9X ZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvV2Vi Q29yZVN1cHBvcnQvUGFnZUNsaWVudFF0LmNwcApAQCAtMzYsMTEgKzM2LDEzIEBACiAjaW5jbHVk ZSA8UVdpbmRvdz4KIAogc3RhdGljIHZvaWQgY3JlYXRlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQz REZyb21XaWRnZXQoUVdpZGdldCogd2lkZ2V0LCBQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKiBj b250ZXh0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgUGxhdGZvcm1HcmFwaGljc1N1cmZhY2UzRCogc3VyZmFjZSkKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBsYXRmb3JtR3JhcGhpY3NT dXJmYWNlM0QqIHN1cmZhY2UsIFFPYmplY3QqKiBzdXJmYWNlT3duZXIpCiB7CiAjaWZkZWYgUVRf T1BFTkdMX0xJQgogICAgICpjb250ZXh0ID0gMDsKICAgICAqc3VyZmFjZSA9IDA7CisgICAgaWYg KHN1cmZhY2VPd25lcikKKyAgICAgICAgKnN1cmZhY2VPd25lciA9IDA7CiAgICAgUUFic3RyYWN0 U2Nyb2xsQXJlYSogc2Nyb2xsQXJlYSA9IHFvYmplY3RfY2FzdDxRQWJzdHJhY3RTY3JvbGxBcmVh Kj4od2lkZ2V0KTsKICAgICBpZiAoIXNjcm9sbEFyZWEpCiAgICAgICAgIHJldHVybjsKQEAgLTUy LDYgKzU0LDggQEAgc3RhdGljIHZvaWQgY3JlYXRlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQzREZy b21XaWRnZXQoUVdpZGdldCogd2lkZ2V0LCBQbGF0Zm9ybUcKICAgICBpZiAoZ2xXaWRnZXQtPmlz VmFsaWQoKSkgewogICAgICAgICAvLyBHZW9tZXRyeSBjYW4gYmUgc2V0IHRvIHplcm8gYmVjYXVz ZSBtX2dsV2lkZ2V0IGlzIHVzZWQgb25seSBmb3IgaXRzIFFHTENvbnRleHQuCiAgICAgICAgIGds V2lkZ2V0LT5zZXRHZW9tZXRyeSgwLCAwLCAwLCAwKTsKKyAgICAgICAgaWYgKHN1cmZhY2VPd25l cikKKyAgICAgICAgICAgICpzdXJmYWNlT3duZXIgPSBnbFdpZGdldDsKICAgICAgICAgKnN1cmZh Y2UgPSBnbFdpZGdldC0+d2luZG93SGFuZGxlKCk7CiAgICAgICAgICpjb250ZXh0ID0gZ2xXaWRn ZXQtPmNvbnRleHQoKS0+Y29udGV4dEhhbmRsZSgpOwogICAgIH0gZWxzZSB7CkBAIC0yMzUsOSAr MjM5LDEwIEBAIHZvaWQgUGFnZUNsaWVudFFXaWRnZXQ6OnNldFdpZGdldFZpc2libGUoV2lkZ2V0 KiB3aWRnZXQsIGJvb2wgdmlzaWJsZSkKIAogI2lmIFVTRSgzRF9HUkFQSElDUykKIHZvaWQgUGFn ZUNsaWVudFFXaWRnZXQ6OmNyZWF0ZVBsYXRmb3JtR3JhcGhpY3NDb250ZXh0M0QoUGxhdGZvcm1H cmFwaGljc0NvbnRleHQzRCogY29udGV4dCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgUGxhdGZvcm1HcmFwaGljc1N1cmZhY2UzRCogc3Vy ZmFjZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgUGxhdGZvcm1HcmFwaGljc1N1cmZhY2UzRCogc3VyZmFjZSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUU9iamVjdCoqIHN1cmZh Y2VPd25lcikKIHsKLSAgICBjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNERnJvbVdpZGdl dCh2aWV3LCBjb250ZXh0LCBzdXJmYWNlKTsKKyAgICBjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29u dGV4dDNERnJvbVdpZGdldCh2aWV3LCBjb250ZXh0LCBzdXJmYWNlLCBzdXJmYWNlT3duZXIpOwog fQogI2VuZGlmCiAKQEAgLTQyNCw5ICs0MjksMTAgQEAgUVJlY3RGIFBhZ2VDbGllbnRRR3JhcGhp Y3NXaWRnZXQ6OndpbmRvd1JlY3QoKSBjb25zdAogCiAjaWYgVVNFKDNEX0dSQVBISUNTKQogdm9p ZCBQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0OjpjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4 dDNEKFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUGxhdGZvcm1H cmFwaGljc1N1cmZhY2UzRCogc3VyZmFjZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQbGF0Zm9ybUdyYXBoaWNzU3VyZmFj ZTNEKiBzdXJmYWNlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFFPYmplY3QqKiBzdXJmYWNlT3duZXIpCiB7Ci0gICAgY3Jl YXRlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQzREZyb21XaWRnZXQob3duZXJXaWRnZXQoKSwgY29u dGV4dCwgc3VyZmFjZSk7CisgICAgY3JlYXRlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQzREZyb21X aWRnZXQob3duZXJXaWRnZXQoKSwgY29udGV4dCwgc3VyZmFjZSwgc3VyZmFjZU93bmVyKTsKIH0K ICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1Bh Z2VDbGllbnRRdC5oIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50 UXQuaAppbmRleCBmZWJjYTAzLi5lNmI5ZTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvV2Vi Q29yZVN1cHBvcnQvUGFnZUNsaWVudFF0LmgKQEAgLTEwMSw3ICsxMDEsOCBAQCBwdWJsaWM6CiAK ICNpZiBVU0UoM0RfR1JBUEhJQ1MpCiAgICAgdmlydHVhbCB2b2lkIGNyZWF0ZVBsYXRmb3JtR3Jh cGhpY3NDb250ZXh0M0QoUGxhdGZvcm1HcmFwaGljc0NvbnRleHQzRCosCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUGxhdGZvcm1HcmFwaGljc1N1cmZh Y2UzRCopOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFBsYXRmb3JtR3JhcGhpY3NTdXJmYWNlM0QqLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFFPYmplY3QqKik7CiAjZW5kaWYKIAogICAgIFFXaWRnZXQq IHZpZXc7CkBAIC0yMDksNyArMjEwLDggQEAgcHVibGljOgogCiAjaWYgVVNFKDNEX0dSQVBISUNT KQogICAgIHZpcnR1YWwgdm9pZCBjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKFBsYXRm b3JtR3JhcGhpY3NDb250ZXh0M0QqLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFBsYXRmb3JtR3JhcGhpY3NTdXJmYWNlM0QqKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQbGF0Zm9ybUdyYXBoaWNzU3Vy ZmFjZTNEKiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBRT2JqZWN0KiopOwogI2VuZGlmCiAKICNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkK