138087 2014-10-26 16:06:25 -0700 Move radius CSS properties to the new StyleBuilder 2014-10-27 13:05:58 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED http://src.chromium.org/viewvc/blink?view=revision&revision=155764 BlinkMergeCandidate P2 Normal --- 137910 1 cdumez cdumez benjamin commit-queue kling koivisto slewis oldest_to_newest 1044205 0 cdumez 2014-10-26 16:06:25 -0700 Move radius CSS properties from DeprecatedStyleBuilder to the new StyleBuilder so that they are now generated from CSSPropertyNames.in. 1044206 1 240470 cdumez 2014-10-26 17:53:38 -0700 Created attachment 240470 Patch 1044207 2 240470 kling 2014-10-26 19:19:04 -0700 Comment on attachment 240470 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240470&action=review > Source/WebCore/css/StyleBuilderConverter.h:175 > + ASSERT(pair && pair->first() && pair->second()); I would break this into (three) separate assertions so you can see which one is failing. > Source/WebCore/css/StyleBuilderConverter.h:181 > + ASSERT(!radiusWidth.isNegative() && !radiusHeight.isNegative()); Ditto here. 1044244 3 240482 cdumez 2014-10-27 08:49:24 -0700 Created attachment 240482 Patch 1044277 4 240482 commit-queue 2014-10-27 11:26:05 -0700 Comment on attachment 240482 Patch Clearing flags on attachment: 240482 Committed r175222: <http://trac.webkit.org/changeset/175222> 1044278 5 commit-queue 2014-10-27 11:26:10 -0700 All reviewed patches have been landed. Closing bug. 1044298 6 cdumez 2014-10-27 12:29:27 -0700 Seems to have caused a few crashes on the bots: https://build.webkit.org/results/Apple%20Mavericks%20Release%20WK1%20(Tests)/r175222%20(9516)/results.html Looking into it now. 1044299 7 cdumez 2014-10-27 12:37:01 -0700 Reopening due to crashes. 1044302 8 240494 cdumez 2014-10-27 12:50:09 -0700 Created attachment 240494 Patch 1044307 9 cdumez 2014-10-27 13:05:58 -0700 Committed r175228: <http://trac.webkit.org/changeset/175228> 240470 2014-10-26 17:53:38 -0700 2014-10-27 08:49:21 -0700 Patch bug-138087-20141026175345.patch text/plain 11466 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1MjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2FiZWMyZDFhZjc1ZWNk Yzk2YjVmNmU1ZmQ0N2ViOWEyMGQ1ZmM0Zi4uZmU2YzNkNjhiNTRkOGE5YzA2YjVmNGQ1YmVlODky ZGMzMzNmNzFlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTEwLTI2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSByYWRpdXMgQ1NTIHBy b3BlcnRpZXMgdG8gdGhlIG5ldyBTdHlsZUJ1aWxkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODA4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgcmFkaXVzIENTUyBwcm9wZXJ0aWVzIGZyb20g RGVwcmVjYXRlZFN0eWxlQnVpbGRlciB0byB0aGUgbmV3CisgICAgICAgIFN0eWxlQnVpbGRlciBz byB0aGF0IHRoZXkgYXJlIG5vdyBnZW5lcmF0ZWQgZnJvbSBDU1NQcm9wZXJ0eU5hbWVzLmluLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICog Y3NzL0NTU1Byb3BlcnR5TmFtZXMuaW46CisgICAgICAgICogY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1 aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGVwcmVjYXRlZFN0eWxlQnVpbGRlcjo6RGVw cmVjYXRlZFN0eWxlQnVpbGRlcik6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5Qm9y ZGVyUmFkaXVzOjpzZXRWYWx1ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVBy b3BlcnR5Qm9yZGVyUmFkaXVzOjphcHBseVZhbHVlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OkFwcGx5UHJvcGVydHlCb3JkZXJSYWRpdXM6OmNyZWF0ZUhhbmRsZXIpOiBEZWxldGVkLgor ICAgICAgICAqIGNzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6 OlN0eWxlQnVpbGRlckNvbnZlcnRlcjo6Y29udmVydFJhZGl1cyk6CisKIDIwMTQtMTAtMjYgIEFu ZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgc29tZSBSZW5k ZXJPYmplY3QgbWVtYmVyIGZ1bmN0aW9ucyB0byBSZW5kZXJFbGVtZW50LgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4gYi9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTUHJvcGVydHlOYW1lcy5pbgppbmRleCBjZWM1NjBiODE1MzNmMjdhMTg2NTE1MDY4YmFj MmU0YWE1NjhmMzFmLi42ZGFiMzU3ZjBjNzk0ZTgzMmI0NjQwMmM0MzM0N2UwZWNjOTZmMjg5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgorKysgYi9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgpAQCAtNTksOSArNTksOSBAQCBi YWNrZ3JvdW5kLXNpemUKIGJvcmRlcgogYm9yZGVyLWJvdHRvbQogYm9yZGVyLWJvdHRvbS1jb2xv cgotYm9yZGVyLWJvdHRvbS1sZWZ0LXJhZGl1cworYm9yZGVyLWJvdHRvbS1sZWZ0LXJhZGl1cyBb TmV3U3R5bGVCdWlsZGVyLCBJbml0aWFsPWluaXRpYWxCb3JkZXJSYWRpdXMsIENvbnZlcnRlcj1S YWRpdXNdCiAtd2Via2l0LWJvcmRlci1ib3R0b20tbGVmdC1yYWRpdXMgPSBib3JkZXItYm90dG9t LWxlZnQtcmFkaXVzCi1ib3JkZXItYm90dG9tLXJpZ2h0LXJhZGl1cworYm9yZGVyLWJvdHRvbS1y aWdodC1yYWRpdXMgW05ld1N0eWxlQnVpbGRlciwgSW5pdGlhbD1pbml0aWFsQm9yZGVyUmFkaXVz LCBDb252ZXJ0ZXI9UmFkaXVzXQogLXdlYmtpdC1ib3JkZXItYm90dG9tLXJpZ2h0LXJhZGl1cyA9 IGJvcmRlci1ib3R0b20tcmlnaHQtcmFkaXVzCiBib3JkZXItYm90dG9tLXN0eWxlIFtOZXdTdHls ZUJ1aWxkZXIsIFR5cGVOYW1lPUVCb3JkZXJTdHlsZSwgSW5pdGlhbD1pbml0aWFsQm9yZGVyU3R5 bGVdCiBib3JkZXItYm90dG9tLXdpZHRoIFtOZXdTdHlsZUJ1aWxkZXIsIEluaXRpYWw9aW5pdGlh bEJvcmRlcldpZHRoLCBDb252ZXJ0ZXI9TGluZVdpZHRoPGZsb2F0Pl0KQEAgLTg2LDkgKzg2LDkg QEAgYm9yZGVyLXNwYWNpbmcgW0luaGVyaXRlZF0KIGJvcmRlci1zdHlsZQogYm9yZGVyLXRvcAog Ym9yZGVyLXRvcC1jb2xvcgotYm9yZGVyLXRvcC1sZWZ0LXJhZGl1cworYm9yZGVyLXRvcC1sZWZ0 LXJhZGl1cyBbTmV3U3R5bGVCdWlsZGVyLCBJbml0aWFsPWluaXRpYWxCb3JkZXJSYWRpdXMsIENv bnZlcnRlcj1SYWRpdXNdCiAtd2Via2l0LWJvcmRlci10b3AtbGVmdC1yYWRpdXMgPSBib3JkZXIt dG9wLWxlZnQtcmFkaXVzCi1ib3JkZXItdG9wLXJpZ2h0LXJhZGl1cworYm9yZGVyLXRvcC1yaWdo dC1yYWRpdXMgW05ld1N0eWxlQnVpbGRlciwgSW5pdGlhbD1pbml0aWFsQm9yZGVyUmFkaXVzLCBD b252ZXJ0ZXI9UmFkaXVzXQogLXdlYmtpdC1ib3JkZXItdG9wLXJpZ2h0LXJhZGl1cyA9IGJvcmRl ci10b3AtcmlnaHQtcmFkaXVzCiBib3JkZXItdG9wLXN0eWxlIFtOZXdTdHlsZUJ1aWxkZXIsIFR5 cGVOYW1lPUVCb3JkZXJTdHlsZSwgSW5pdGlhbD1pbml0aWFsQm9yZGVyU3R5bGVdCiBib3JkZXIt dG9wLXdpZHRoIFtOZXdTdHlsZUJ1aWxkZXIsIEluaXRpYWw9aW5pdGlhbEJvcmRlcldpZHRoLCBD b252ZXJ0ZXI9TGluZVdpZHRoPGZsb2F0Pl0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNh dGVkU3R5bGVCdWlsZGVyLmNwcAppbmRleCAzMzI0NDRmMzY3MmJkMzUzM2FiZThkMzRjMjcyYjg3 M2QxOGJkMjRjLi43YjJiMWQwZmM5ODNiZjU3NWJhNTM1N2JlNjNkN2UzZmMxMzdiMzM3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCkBAIC00MzIs NTQgKzQzMiw2IEBAIHB1YmxpYzoKICAgICB9CiB9OwogCi10ZW1wbGF0ZSA8Y29uc3QgTGVuZ3Ro U2l6ZSYgKFJlbmRlclN0eWxlOjoqZ2V0dGVyRnVuY3Rpb24pKCkgY29uc3QsIHZvaWQgKFJlbmRl clN0eWxlOjoqc2V0dGVyRnVuY3Rpb24pKExlbmd0aFNpemUpLCBMZW5ndGhTaXplICgqaW5pdGlh bEZ1bmN0aW9uKSgpPgotY2xhc3MgQXBwbHlQcm9wZXJ0eUJvcmRlclJhZGl1cyB7Ci1wdWJsaWM6 Ci0gICAgc3RhdGljIHZvaWQgc2V0VmFsdWUoUmVuZGVyU3R5bGUqIHN0eWxlLCBMZW5ndGhTaXpl IHZhbHVlKSB7IChzdHlsZS0+KnNldHRlckZ1bmN0aW9uKShXVEY6Om1vdmUodmFsdWUpKTsgfQot ICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWUoQ1NTUHJvcGVydHlJRCwgU3R5bGVSZXNvbHZlciog c3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUqIHZhbHVlKQotICAgIHsKLSAgICAgICAgaWYgKCFpczxD U1NQcmltaXRpdmVWYWx1ZT4oKnZhbHVlKSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAg ICBDU1NQcmltaXRpdmVWYWx1ZSYgcHJpbWl0aXZlVmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRp dmVWYWx1ZT4oKnZhbHVlKTsKLSAgICAgICAgUGFpciogcGFpciA9IHByaW1pdGl2ZVZhbHVlLmdl dFBhaXJWYWx1ZSgpOwotICAgICAgICBpZiAoIXBhaXIgfHwgIXBhaXItPmZpcnN0KCkgfHwgIXBh aXItPnNlY29uZCgpKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIENTU1RvTGVuZ3Ro Q29udmVyc2lvbkRhdGEgY29udmVyc2lvbkRhdGEgPSBzdHlsZVJlc29sdmVyLT5zdGF0ZSgpLmNz c1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEoKTsKLSAgICAgICAgTGVuZ3RoIHJhZGl1c1dpZHRoOwot ICAgICAgICBpZiAocGFpci0+Zmlyc3QoKS0+aXNQZXJjZW50YWdlKCkpCi0gICAgICAgICAgICBy YWRpdXNXaWR0aCA9IExlbmd0aChwYWlyLT5maXJzdCgpLT5nZXREb3VibGVWYWx1ZSgpLCBQZXJj ZW50KTsKLSAgICAgICAgZWxzZSBpZiAocGFpci0+Zmlyc3QoKS0+aXNDYWxjdWxhdGVkUGVyY2Vu dGFnZVdpdGhMZW5ndGgoKSkKLSAgICAgICAgICAgIHJhZGl1c1dpZHRoID0gTGVuZ3RoKHBhaXIt PmZpcnN0KCktPmNzc0NhbGNWYWx1ZSgpLT5jcmVhdGVDYWxjdWxhdGlvblZhbHVlKGNvbnZlcnNp b25EYXRhKSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHJhZGl1c1dpZHRoID0gcGFpci0+ Zmlyc3QoKS0+Y29tcHV0ZUxlbmd0aDxMZW5ndGg+KGNvbnZlcnNpb25EYXRhKTsKLQotICAgICAg ICBMZW5ndGggcmFkaXVzSGVpZ2h0OwotICAgICAgICBpZiAocGFpci0+c2Vjb25kKCktPmlzUGVy Y2VudGFnZSgpKQotICAgICAgICAgICAgcmFkaXVzSGVpZ2h0ID0gTGVuZ3RoKHBhaXItPnNlY29u ZCgpLT5nZXREb3VibGVWYWx1ZSgpLCBQZXJjZW50KTsKLSAgICAgICAgZWxzZSBpZiAocGFpci0+ c2Vjb25kKCktPmlzQ2FsY3VsYXRlZFBlcmNlbnRhZ2VXaXRoTGVuZ3RoKCkpCi0gICAgICAgICAg ICByYWRpdXNIZWlnaHQgPSBMZW5ndGgocGFpci0+c2Vjb25kKCktPmNzc0NhbGNWYWx1ZSgpLT5j cmVhdGVDYWxjdWxhdGlvblZhbHVlKGNvbnZlcnNpb25EYXRhKSk7Ci0gICAgICAgIGVsc2UKLSAg ICAgICAgICAgIHJhZGl1c0hlaWdodCA9IHBhaXItPnNlY29uZCgpLT5jb21wdXRlTGVuZ3RoPExl bmd0aD4oY29udmVyc2lvbkRhdGEpOwotCi0gICAgICAgIGlmIChyYWRpdXNXaWR0aC5pc05lZ2F0 aXZlKCkgfHwgcmFkaXVzSGVpZ2h0LmlzTmVnYXRpdmUoKSkKLSAgICAgICAgICAgIHJldHVybjsK LQotICAgICAgICBpZiAocmFkaXVzV2lkdGguaXNaZXJvKCkgfHwgcmFkaXVzSGVpZ2h0LmlzWmVy bygpKSB7Ci0gICAgICAgICAgICByYWRpdXNXaWR0aC5zZXRWYWx1ZShGaXhlZCwgMCk7Ci0gICAg ICAgICAgICByYWRpdXNIZWlnaHQuc2V0VmFsdWUoRml4ZWQsIDApOwotICAgICAgICB9Ci0KLSAg ICAgICAgc2V0VmFsdWUoc3R5bGVSZXNvbHZlci0+c3R5bGUoKSwgTGVuZ3RoU2l6ZShyYWRpdXNX aWR0aCwgcmFkaXVzSGVpZ2h0KSk7Ci0gICAgfQotICAgIHN0YXRpYyBQcm9wZXJ0eUhhbmRsZXIg Y3JlYXRlSGFuZGxlcigpCi0gICAgewotICAgICAgICBQcm9wZXJ0eUhhbmRsZXIgaGFuZGxlciA9 IEFwcGx5UHJvcGVydHlEZWZhdWx0QmFzZTxjb25zdCBMZW5ndGhTaXplJiwgZ2V0dGVyRnVuY3Rp b24sIExlbmd0aFNpemUsIHNldHRlckZ1bmN0aW9uLCBMZW5ndGhTaXplLCBpbml0aWFsRnVuY3Rp b24+OjpjcmVhdGVIYW5kbGVyKCk7Ci0gICAgICAgIHJldHVybiBQcm9wZXJ0eUhhbmRsZXIoaGFu ZGxlci5pbmhlcml0RnVuY3Rpb24oKSwgaGFuZGxlci5pbml0aWFsRnVuY3Rpb24oKSwgJmFwcGx5 VmFsdWUpOwotICAgIH0KLX07Ci0KIHRlbXBsYXRlIDx0eXBlbmFtZSBUPgogc3RydWN0IEZpbGxM YXllckFjY2Vzc29yVHlwZXMgewogICAgIHR5cGVkZWYgVCBTZXR0ZXI7CkBAIC0yMzAwLDggKzIy NTIsNiBAQCBEZXByZWNhdGVkU3R5bGVCdWlsZGVyOjpEZXByZWNhdGVkU3R5bGVCdWlsZGVyKCkK ICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kUmVwZWF0WSwgQXBw bHlQcm9wZXJ0eUZpbGxMYXllcjxFRmlsbFJlcGVhdCwgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kUmVw ZWF0WSwgQmFja2dyb3VuZEZpbGxMYXllciwgJlJlbmRlclN0eWxlOjphY2Nlc3NCYWNrZ3JvdW5k TGF5ZXJzLCAmUmVuZGVyU3R5bGU6OmJhY2tncm91bmRMYXllcnMsICZGaWxsTGF5ZXI6OmlzUmVw ZWF0WVNldCwgJkZpbGxMYXllcjo6cmVwZWF0WSwgJkZpbGxMYXllcjo6c2V0UmVwZWF0WSwgJkZp bGxMYXllcjo6Y2xlYXJSZXBlYXRZLCAmRmlsbExheWVyOjppbml0aWFsRmlsbFJlcGVhdFksICZD U1NUb1N0eWxlTWFwOjptYXBGaWxsUmVwZWF0WT46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0 UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5QmFja2dyb3VuZFNpemUsIEFwcGx5UHJvcGVydHlG aWxsTGF5ZXI8RmlsbFNpemUsIENTU1Byb3BlcnR5QmFja2dyb3VuZFNpemUsIEJhY2tncm91bmRG aWxsTGF5ZXIsICZSZW5kZXJTdHlsZTo6YWNjZXNzQmFja2dyb3VuZExheWVycywgJlJlbmRlclN0 eWxlOjpiYWNrZ3JvdW5kTGF5ZXJzLCAmRmlsbExheWVyOjppc1NpemVTZXQsICZGaWxsTGF5ZXI6 OnNpemUsICZGaWxsTGF5ZXI6OnNldFNpemUsICZGaWxsTGF5ZXI6OmNsZWFyU2l6ZSwgJkZpbGxM YXllcjo6aW5pdGlhbEZpbGxTaXplLCAmQ1NTVG9TdHlsZU1hcDo6bWFwRmlsbFNpemU+OjpjcmVh dGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRlckJv dHRvbUNvbG9yLCBBcHBseVByb3BlcnR5Q29sb3I8Tm9Jbmhlcml0RnJvbVBhcmVudCwgJlJlbmRl clN0eWxlOjpib3JkZXJCb3R0b21Db2xvciwgJlJlbmRlclN0eWxlOjpzZXRCb3JkZXJCb3R0b21D b2xvciwgJlJlbmRlclN0eWxlOjpzZXRWaXNpdGVkTGlua0JvcmRlckJvdHRvbUNvbG9yLCAmUmVu ZGVyU3R5bGU6OmNvbG9yPjo6Y3JlYXRlSGFuZGxlcigpKTsKLSAgICBzZXRQcm9wZXJ0eUhhbmRs ZXIoQ1NTUHJvcGVydHlCb3JkZXJCb3R0b21MZWZ0UmFkaXVzLCBBcHBseVByb3BlcnR5Qm9yZGVy UmFkaXVzPCZSZW5kZXJTdHlsZTo6Ym9yZGVyQm90dG9tTGVmdFJhZGl1cywgJlJlbmRlclN0eWxl OjpzZXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVzLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxCb3JkZXJS YWRpdXM+OjpjcmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9w ZXJ0eUJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzLCBBcHBseVByb3BlcnR5Qm9yZGVyUmFkaXVzPCZS ZW5kZXJTdHlsZTo6Ym9yZGVyQm90dG9tUmlnaHRSYWRpdXMsICZSZW5kZXJTdHlsZTo6c2V0Qm9y ZGVyQm90dG9tUmlnaHRSYWRpdXMsICZSZW5kZXJTdHlsZTo6aW5pdGlhbEJvcmRlclJhZGl1cz46 OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9y ZGVySW1hZ2VPdXRzZXQsIEFwcGx5UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyPEJvcmRlcklt YWdlLCBPdXRzZXQ+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihD U1NQcm9wZXJ0eUJvcmRlckltYWdlUmVwZWF0LCBBcHBseVByb3BlcnR5Qm9yZGVySW1hZ2VNb2Rp ZmllcjxCb3JkZXJJbWFnZSwgUmVwZWF0Pjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9w ZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJJbWFnZVNsaWNlLCBBcHBseVByb3BlcnR5Qm9y ZGVySW1hZ2VNb2RpZmllcjxCb3JkZXJJbWFnZSwgU2xpY2U+OjpjcmVhdGVIYW5kbGVyKCkpOwpA QCAtMjMxMCw4ICsyMjYwLDYgQEAgRGVwcmVjYXRlZFN0eWxlQnVpbGRlcjo6RGVwcmVjYXRlZFN0 eWxlQnVpbGRlcigpCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9yZGVyTGVm dENvbG9yLCBBcHBseVByb3BlcnR5Q29sb3I8Tm9Jbmhlcml0RnJvbVBhcmVudCwgJlJlbmRlclN0 eWxlOjpib3JkZXJMZWZ0Q29sb3IsICZSZW5kZXJTdHlsZTo6c2V0Qm9yZGVyTGVmdENvbG9yLCAm UmVuZGVyU3R5bGU6OnNldFZpc2l0ZWRMaW5rQm9yZGVyTGVmdENvbG9yLCAmUmVuZGVyU3R5bGU6 OmNvbG9yPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJv cGVydHlCb3JkZXJSaWdodENvbG9yLCBBcHBseVByb3BlcnR5Q29sb3I8Tm9Jbmhlcml0RnJvbVBh cmVudCwgJlJlbmRlclN0eWxlOjpib3JkZXJSaWdodENvbG9yLCAmUmVuZGVyU3R5bGU6OnNldEJv cmRlclJpZ2h0Q29sb3IsICZSZW5kZXJTdHlsZTo6c2V0VmlzaXRlZExpbmtCb3JkZXJSaWdodENv bG9yLCAmUmVuZGVyU3R5bGU6OmNvbG9yPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9w ZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJUb3BDb2xvciwgQXBwbHlQcm9wZXJ0eUNvbG9y PE5vSW5oZXJpdEZyb21QYXJlbnQsICZSZW5kZXJTdHlsZTo6Ym9yZGVyVG9wQ29sb3IsICZSZW5k ZXJTdHlsZTo6c2V0Qm9yZGVyVG9wQ29sb3IsICZSZW5kZXJTdHlsZTo6c2V0VmlzaXRlZExpbmtC b3JkZXJUb3BDb2xvciwgJlJlbmRlclN0eWxlOjpjb2xvcj46OmNyZWF0ZUhhbmRsZXIoKSk7Ci0g ICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9yZGVyVG9wTGVmdFJhZGl1cywgQXBw bHlQcm9wZXJ0eUJvcmRlclJhZGl1czwmUmVuZGVyU3R5bGU6OmJvcmRlclRvcExlZnRSYWRpdXMs ICZSZW5kZXJTdHlsZTo6c2V0Qm9yZGVyVG9wTGVmdFJhZGl1cywgJlJlbmRlclN0eWxlOjppbml0 aWFsQm9yZGVyUmFkaXVzPjo6Y3JlYXRlSGFuZGxlcigpKTsKLSAgICBzZXRQcm9wZXJ0eUhhbmRs ZXIoQ1NTUHJvcGVydHlCb3JkZXJUb3BSaWdodFJhZGl1cywgQXBwbHlQcm9wZXJ0eUJvcmRlclJh ZGl1czwmUmVuZGVyU3R5bGU6OmJvcmRlclRvcFJpZ2h0UmFkaXVzLCAmUmVuZGVyU3R5bGU6OnNl dEJvcmRlclRvcFJpZ2h0UmFkaXVzLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxCb3JkZXJSYWRpdXM+ OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUNs aXAsIEFwcGx5UHJvcGVydHlDbGlwOjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5 SGFuZGxlcihDU1NQcm9wZXJ0eUNvbG9yLCBBcHBseVByb3BlcnR5Q29sb3I8SW5oZXJpdEZyb21Q YXJlbnQsICZSZW5kZXJTdHlsZTo6Y29sb3IsICZSZW5kZXJTdHlsZTo6c2V0Q29sb3IsICZSZW5k ZXJTdHlsZTo6c2V0VmlzaXRlZExpbmtDb2xvciwgJlJlbmRlclN0eWxlOjppbnZhbGlkQ29sb3Is IFJlbmRlclN0eWxlOjppbml0aWFsQ29sb3I+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFBy b3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUNvdW50ZXJJbmNyZW1lbnQsIEFwcGx5UHJvcGVydHlD b3VudGVyPEluY3JlbWVudD46OmNyZWF0ZUhhbmRsZXIoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ29udmVydGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv U3R5bGVCdWlsZGVyQ29udmVydGVyLmgKaW5kZXggMjQ2ODZiYjk2NGUyNjZhNjM3N2Y2OTJkNTYy OGZhZjY5YjY0ZWIyMC4uYzUwMGQ2MjIzMDczZjk1YTM2ODRhYjlmYWZiZjM5NzkwNDk2NDdmMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckNvbnZlcnRlci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaApAQCAtMzAsNiAr MzAsNyBAQAogI2luY2x1ZGUgIkNTU0NhbGN1bGF0aW9uVmFsdWUuaCIKICNpbmNsdWRlICJDU1NQ cmltaXRpdmVWYWx1ZS5oIgogI2luY2x1ZGUgIkxlbmd0aC5oIgorI2luY2x1ZGUgIlBhaXIuaCIK ICNpbmNsdWRlICJTdHlsZVJlc29sdmVyLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTQz LDYgKzQ0LDEwIEBAIHB1YmxpYzoKICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4gc3RhdGljIFQg Y29udmVydENvbXB1dGVkTGVuZ3RoKFN0eWxlUmVzb2x2ZXImLCBDU1NWYWx1ZSYpOwogICAgIHRl bXBsYXRlIDx0eXBlbmFtZSBUPiBzdGF0aWMgVCBjb252ZXJ0TGluZVdpZHRoKFN0eWxlUmVzb2x2 ZXImLCBDU1NWYWx1ZSYpOwogICAgIHN0YXRpYyBmbG9hdCBjb252ZXJ0U3BhY2luZyhTdHlsZVJl c29sdmVyJiwgQ1NTVmFsdWUmKTsKKyAgICBzdGF0aWMgTGVuZ3RoU2l6ZSBjb252ZXJ0UmFkaXVz KFN0eWxlUmVzb2x2ZXImLCBDU1NWYWx1ZSYpOworCitwcml2YXRlOgorICAgIHN0YXRpYyBMZW5n dGggY29udmVydFRvUmFkaXVzTGVuZ3RoKENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmLCBDU1NQ cmltaXRpdmVWYWx1ZSYpOwogfTsKIAogaW5saW5lIExlbmd0aCBTdHlsZUJ1aWxkZXJDb252ZXJ0 ZXI6OmNvbnZlcnRMZW5ndGgoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUm IHZhbHVlKQpAQCAtMTU0LDYgKzE1OSwzMiBAQCBpbmxpbmUgZmxvYXQgU3R5bGVCdWlsZGVyQ29u dmVydGVyOjpjb252ZXJ0U3BhY2luZyhTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLAogICAg IHJldHVybiBwcmltaXRpdmVWYWx1ZS5jb21wdXRlTGVuZ3RoPGZsb2F0Pihjb252ZXJzaW9uRGF0 YSk7CiB9CiAKK0xlbmd0aCBTdHlsZUJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRUb1JhZGl1c0xl bmd0aChDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhJiBjb252ZXJzaW9uRGF0YSwgQ1NTUHJpbWl0 aXZlVmFsdWUmIHZhbHVlKQoreworICAgIGlmICh2YWx1ZS5pc1BlcmNlbnRhZ2UoKSkKKyAgICAg ICAgcmV0dXJuIExlbmd0aCh2YWx1ZS5nZXREb3VibGVWYWx1ZSgpLCBQZXJjZW50KTsKKyAgICBp ZiAodmFsdWUuaXNDYWxjdWxhdGVkUGVyY2VudGFnZVdpdGhMZW5ndGgoKSkKKyAgICAgICAgcmV0 dXJuIExlbmd0aCh2YWx1ZS5jc3NDYWxjVmFsdWUoKS0+Y3JlYXRlQ2FsY3VsYXRpb25WYWx1ZShj b252ZXJzaW9uRGF0YSkpOworICAgIHJldHVybiB2YWx1ZS5jb21wdXRlTGVuZ3RoPExlbmd0aD4o Y29udmVyc2lvbkRhdGEpOworfQorCitMZW5ndGhTaXplIFN0eWxlQnVpbGRlckNvbnZlcnRlcjo6 Y29udmVydFJhZGl1cyhTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFs dWUpCit7CisgICAgYXV0byYgcHJpbWl0aXZlVmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVW YWx1ZT4odmFsdWUpOworICAgIFBhaXIqIHBhaXIgPSBwcmltaXRpdmVWYWx1ZS5nZXRQYWlyVmFs dWUoKTsKKyAgICBBU1NFUlQocGFpciAmJiBwYWlyLT5maXJzdCgpICYmIHBhaXItPnNlY29uZCgp KTsKKworICAgIENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEgY29udmVyc2lvbkRhdGEgPSBzdHls ZVJlc29sdmVyLnN0YXRlKCkuY3NzVG9MZW5ndGhDb252ZXJzaW9uRGF0YSgpOworICAgIExlbmd0 aCByYWRpdXNXaWR0aCA9IGNvbnZlcnRUb1JhZGl1c0xlbmd0aChjb252ZXJzaW9uRGF0YSwgKnBh aXItPmZpcnN0KCkpOworICAgIExlbmd0aCByYWRpdXNIZWlnaHQgPSBjb252ZXJ0VG9SYWRpdXNM ZW5ndGgoY29udmVyc2lvbkRhdGEsICpwYWlyLT5zZWNvbmQoKSk7CisKKyAgICBBU1NFUlQoIXJh ZGl1c1dpZHRoLmlzTmVnYXRpdmUoKSAmJiAhcmFkaXVzSGVpZ2h0LmlzTmVnYXRpdmUoKSk7Cisg ICAgaWYgKHJhZGl1c1dpZHRoLmlzWmVybygpIHx8IHJhZGl1c0hlaWdodC5pc1plcm8oKSkKKyAg ICAgICAgcmV0dXJuIExlbmd0aFNpemUoTGVuZ3RoKDAsIEZpeGVkKSwgTGVuZ3RoKDAsIEZpeGVk KSk7CisKKyAgICByZXR1cm4gTGVuZ3RoU2l6ZShyYWRpdXNXaWR0aCwgcmFkaXVzSGVpZ2h0KTsK K30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gU3R5bGVCdWlsZGVyQ29u dmVydGVyX2gK 240482 2014-10-27 08:49:24 -0700 2014-10-27 12:50:06 -0700 Patch bug-138087-20141027084932.patch text/plain 11498 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1MjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2FiZWMyZDFhZjc1ZWNk Yzk2YjVmNmU1ZmQ0N2ViOWEyMGQ1ZmM0Zi4uYzM4MzY0OWZmODc0NDZlMWVlNDdiNTgwMzhiYWY5 ZTUwZjFhZjVhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTEwLTI2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSByYWRpdXMgQ1NTIHBy b3BlcnRpZXMgdG8gdGhlIG5ldyBTdHlsZUJ1aWxkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODA4NworCisgICAgICAgIFJldmlld2VkIGJ5IEFu ZHJlYXMgS2xpbmcuCisKKyAgICAgICAgTW92ZSByYWRpdXMgQ1NTIHByb3BlcnRpZXMgZnJvbSBE ZXByZWNhdGVkU3R5bGVCdWlsZGVyIHRvIHRoZSBuZXcKKyAgICAgICAgU3R5bGVCdWlsZGVyIHNv IHRoYXQgdGhleSBhcmUgbm93IGdlbmVyYXRlZCBmcm9tIENTU1Byb3BlcnR5TmFtZXMuaW4uCisK KyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBj c3MvQ1NTUHJvcGVydHlOYW1lcy5pbjoKKyAgICAgICAgKiBjc3MvRGVwcmVjYXRlZFN0eWxlQnVp bGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEZXByZWNhdGVkU3R5bGVCdWlsZGVyOjpEZXBy ZWNhdGVkU3R5bGVCdWlsZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlCb3Jk ZXJSYWRpdXM6OnNldFZhbHVlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJv cGVydHlCb3JkZXJSYWRpdXM6OmFwcGx5VmFsdWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6QXBwbHlQcm9wZXJ0eUJvcmRlclJhZGl1czo6Y3JlYXRlSGFuZGxlcik6IERlbGV0ZWQuCisg ICAgICAgICogY3NzL1N0eWxlQnVpbGRlckNvbnZlcnRlci5oOgorICAgICAgICAoV2ViQ29yZTo6 U3R5bGVCdWlsZGVyQ29udmVydGVyOjpjb252ZXJ0UmFkaXVzKToKKwogMjAxNC0xMC0yNiAgQW5k cmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBzb21lIFJlbmRl ck9iamVjdCBtZW1iZXIgZnVuY3Rpb25zIHRvIFJlbmRlckVsZW1lbnQuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbiBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NQcm9wZXJ0eU5hbWVzLmluCmluZGV4IGNlYzU2MGI4MTUzM2YyN2ExODY1MTUwNjhiYWMy ZTRhYTU2OGYzMWYuLjZkYWIzNTdmMGM3OTRlODMyYjQ2NDAyYzQzMzQ3ZTBlY2M5NmYyODkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCkBAIC01OSw5ICs1OSw5IEBAIGJh Y2tncm91bmQtc2l6ZQogYm9yZGVyCiBib3JkZXItYm90dG9tCiBib3JkZXItYm90dG9tLWNvbG9y Ci1ib3JkZXItYm90dG9tLWxlZnQtcmFkaXVzCitib3JkZXItYm90dG9tLWxlZnQtcmFkaXVzIFtO ZXdTdHlsZUJ1aWxkZXIsIEluaXRpYWw9aW5pdGlhbEJvcmRlclJhZGl1cywgQ29udmVydGVyPVJh ZGl1c10KIC13ZWJraXQtYm9yZGVyLWJvdHRvbS1sZWZ0LXJhZGl1cyA9IGJvcmRlci1ib3R0b20t bGVmdC1yYWRpdXMKLWJvcmRlci1ib3R0b20tcmlnaHQtcmFkaXVzCitib3JkZXItYm90dG9tLXJp Z2h0LXJhZGl1cyBbTmV3U3R5bGVCdWlsZGVyLCBJbml0aWFsPWluaXRpYWxCb3JkZXJSYWRpdXMs IENvbnZlcnRlcj1SYWRpdXNdCiAtd2Via2l0LWJvcmRlci1ib3R0b20tcmlnaHQtcmFkaXVzID0g Ym9yZGVyLWJvdHRvbS1yaWdodC1yYWRpdXMKIGJvcmRlci1ib3R0b20tc3R5bGUgW05ld1N0eWxl QnVpbGRlciwgVHlwZU5hbWU9RUJvcmRlclN0eWxlLCBJbml0aWFsPWluaXRpYWxCb3JkZXJTdHls ZV0KIGJvcmRlci1ib3R0b20td2lkdGggW05ld1N0eWxlQnVpbGRlciwgSW5pdGlhbD1pbml0aWFs Qm9yZGVyV2lkdGgsIENvbnZlcnRlcj1MaW5lV2lkdGg8ZmxvYXQ+XQpAQCAtODYsOSArODYsOSBA QCBib3JkZXItc3BhY2luZyBbSW5oZXJpdGVkXQogYm9yZGVyLXN0eWxlCiBib3JkZXItdG9wCiBi b3JkZXItdG9wLWNvbG9yCi1ib3JkZXItdG9wLWxlZnQtcmFkaXVzCitib3JkZXItdG9wLWxlZnQt cmFkaXVzIFtOZXdTdHlsZUJ1aWxkZXIsIEluaXRpYWw9aW5pdGlhbEJvcmRlclJhZGl1cywgQ29u dmVydGVyPVJhZGl1c10KIC13ZWJraXQtYm9yZGVyLXRvcC1sZWZ0LXJhZGl1cyA9IGJvcmRlci10 b3AtbGVmdC1yYWRpdXMKLWJvcmRlci10b3AtcmlnaHQtcmFkaXVzCitib3JkZXItdG9wLXJpZ2h0 LXJhZGl1cyBbTmV3U3R5bGVCdWlsZGVyLCBJbml0aWFsPWluaXRpYWxCb3JkZXJSYWRpdXMsIENv bnZlcnRlcj1SYWRpdXNdCiAtd2Via2l0LWJvcmRlci10b3AtcmlnaHQtcmFkaXVzID0gYm9yZGVy LXRvcC1yaWdodC1yYWRpdXMKIGJvcmRlci10b3Atc3R5bGUgW05ld1N0eWxlQnVpbGRlciwgVHlw ZU5hbWU9RUJvcmRlclN0eWxlLCBJbml0aWFsPWluaXRpYWxCb3JkZXJTdHlsZV0KIGJvcmRlci10 b3Atd2lkdGggW05ld1N0eWxlQnVpbGRlciwgSW5pdGlhbD1pbml0aWFsQm9yZGVyV2lkdGgsIENv bnZlcnRlcj1MaW5lV2lkdGg8ZmxvYXQ+XQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3Nz L0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0 ZWRTdHlsZUJ1aWxkZXIuY3BwCmluZGV4IDMzMjQ0NGYzNjcyYmQzNTMzYWJlOGQzNGMyNzJiODcz ZDE4YmQyNGMuLjdiMmIxZDBmYzk4M2JmNTc1YmE1MzU3YmU2M2Q3ZTNmYzEzN2IzMzcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAKQEAgLTQzMiw1 NCArNDMyLDYgQEAgcHVibGljOgogICAgIH0KIH07CiAKLXRlbXBsYXRlIDxjb25zdCBMZW5ndGhT aXplJiAoUmVuZGVyU3R5bGU6OipnZXR0ZXJGdW5jdGlvbikoKSBjb25zdCwgdm9pZCAoUmVuZGVy U3R5bGU6OipzZXR0ZXJGdW5jdGlvbikoTGVuZ3RoU2l6ZSksIExlbmd0aFNpemUgKCppbml0aWFs RnVuY3Rpb24pKCk+Ci1jbGFzcyBBcHBseVByb3BlcnR5Qm9yZGVyUmFkaXVzIHsKLXB1YmxpYzoK LSAgICBzdGF0aWMgdm9pZCBzZXRWYWx1ZShSZW5kZXJTdHlsZSogc3R5bGUsIExlbmd0aFNpemUg dmFsdWUpIHsgKHN0eWxlLT4qc2V0dGVyRnVuY3Rpb24pKFdURjo6bW92ZSh2YWx1ZSkpOyB9Ci0g ICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZShDU1NQcm9wZXJ0eUlELCBTdHlsZVJlc29sdmVyKiBz dHlsZVJlc29sdmVyLCBDU1NWYWx1ZSogdmFsdWUpCi0gICAgewotICAgICAgICBpZiAoIWlzPENT U1ByaW1pdGl2ZVZhbHVlPigqdmFsdWUpKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAg IENTU1ByaW1pdGl2ZVZhbHVlJiBwcmltaXRpdmVWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2 ZVZhbHVlPigqdmFsdWUpOwotICAgICAgICBQYWlyKiBwYWlyID0gcHJpbWl0aXZlVmFsdWUuZ2V0 UGFpclZhbHVlKCk7Ci0gICAgICAgIGlmICghcGFpciB8fCAhcGFpci0+Zmlyc3QoKSB8fCAhcGFp ci0+c2Vjb25kKCkpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgQ1NTVG9MZW5ndGhD b252ZXJzaW9uRGF0YSBjb252ZXJzaW9uRGF0YSA9IHN0eWxlUmVzb2x2ZXItPnN0YXRlKCkuY3Nz VG9MZW5ndGhDb252ZXJzaW9uRGF0YSgpOwotICAgICAgICBMZW5ndGggcmFkaXVzV2lkdGg7Ci0g ICAgICAgIGlmIChwYWlyLT5maXJzdCgpLT5pc1BlcmNlbnRhZ2UoKSkKLSAgICAgICAgICAgIHJh ZGl1c1dpZHRoID0gTGVuZ3RoKHBhaXItPmZpcnN0KCktPmdldERvdWJsZVZhbHVlKCksIFBlcmNl bnQpOwotICAgICAgICBlbHNlIGlmIChwYWlyLT5maXJzdCgpLT5pc0NhbGN1bGF0ZWRQZXJjZW50 YWdlV2l0aExlbmd0aCgpKQotICAgICAgICAgICAgcmFkaXVzV2lkdGggPSBMZW5ndGgocGFpci0+ Zmlyc3QoKS0+Y3NzQ2FsY1ZhbHVlKCktPmNyZWF0ZUNhbGN1bGF0aW9uVmFsdWUoY29udmVyc2lv bkRhdGEpKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgcmFkaXVzV2lkdGggPSBwYWlyLT5m aXJzdCgpLT5jb21wdXRlTGVuZ3RoPExlbmd0aD4oY29udmVyc2lvbkRhdGEpOwotCi0gICAgICAg IExlbmd0aCByYWRpdXNIZWlnaHQ7Ci0gICAgICAgIGlmIChwYWlyLT5zZWNvbmQoKS0+aXNQZXJj ZW50YWdlKCkpCi0gICAgICAgICAgICByYWRpdXNIZWlnaHQgPSBMZW5ndGgocGFpci0+c2Vjb25k KCktPmdldERvdWJsZVZhbHVlKCksIFBlcmNlbnQpOwotICAgICAgICBlbHNlIGlmIChwYWlyLT5z ZWNvbmQoKS0+aXNDYWxjdWxhdGVkUGVyY2VudGFnZVdpdGhMZW5ndGgoKSkKLSAgICAgICAgICAg IHJhZGl1c0hlaWdodCA9IExlbmd0aChwYWlyLT5zZWNvbmQoKS0+Y3NzQ2FsY1ZhbHVlKCktPmNy ZWF0ZUNhbGN1bGF0aW9uVmFsdWUoY29udmVyc2lvbkRhdGEpKTsKLSAgICAgICAgZWxzZQotICAg ICAgICAgICAgcmFkaXVzSGVpZ2h0ID0gcGFpci0+c2Vjb25kKCktPmNvbXB1dGVMZW5ndGg8TGVu Z3RoPihjb252ZXJzaW9uRGF0YSk7Ci0KLSAgICAgICAgaWYgKHJhZGl1c1dpZHRoLmlzTmVnYXRp dmUoKSB8fCByYWRpdXNIZWlnaHQuaXNOZWdhdGl2ZSgpKQotICAgICAgICAgICAgcmV0dXJuOwot Ci0gICAgICAgIGlmIChyYWRpdXNXaWR0aC5pc1plcm8oKSB8fCByYWRpdXNIZWlnaHQuaXNaZXJv KCkpIHsKLSAgICAgICAgICAgIHJhZGl1c1dpZHRoLnNldFZhbHVlKEZpeGVkLCAwKTsKLSAgICAg ICAgICAgIHJhZGl1c0hlaWdodC5zZXRWYWx1ZShGaXhlZCwgMCk7Ci0gICAgICAgIH0KLQotICAg ICAgICBzZXRWYWx1ZShzdHlsZVJlc29sdmVyLT5zdHlsZSgpLCBMZW5ndGhTaXplKHJhZGl1c1dp ZHRoLCByYWRpdXNIZWlnaHQpKTsKLSAgICB9Ci0gICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBj cmVhdGVIYW5kbGVyKCkKLSAgICB7Ci0gICAgICAgIFByb3BlcnR5SGFuZGxlciBoYW5kbGVyID0g QXBwbHlQcm9wZXJ0eURlZmF1bHRCYXNlPGNvbnN0IExlbmd0aFNpemUmLCBnZXR0ZXJGdW5jdGlv biwgTGVuZ3RoU2l6ZSwgc2V0dGVyRnVuY3Rpb24sIExlbmd0aFNpemUsIGluaXRpYWxGdW5jdGlv bj46OmNyZWF0ZUhhbmRsZXIoKTsKLSAgICAgICAgcmV0dXJuIFByb3BlcnR5SGFuZGxlcihoYW5k bGVyLmluaGVyaXRGdW5jdGlvbigpLCBoYW5kbGVyLmluaXRpYWxGdW5jdGlvbigpLCAmYXBwbHlW YWx1ZSk7Ci0gICAgfQotfTsKLQogdGVtcGxhdGUgPHR5cGVuYW1lIFQ+CiBzdHJ1Y3QgRmlsbExh eWVyQWNjZXNzb3JUeXBlcyB7CiAgICAgdHlwZWRlZiBUIFNldHRlcjsKQEAgLTIzMDAsOCArMjI1 Miw2IEBAIERlcHJlY2F0ZWRTdHlsZUJ1aWxkZXI6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIoKQog ICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJhY2tncm91bmRSZXBlYXRZLCBBcHBs eVByb3BlcnR5RmlsbExheWVyPEVGaWxsUmVwZWF0LCBDU1NQcm9wZXJ0eUJhY2tncm91bmRSZXBl YXRZLCBCYWNrZ3JvdW5kRmlsbExheWVyLCAmUmVuZGVyU3R5bGU6OmFjY2Vzc0JhY2tncm91bmRM YXllcnMsICZSZW5kZXJTdHlsZTo6YmFja2dyb3VuZExheWVycywgJkZpbGxMYXllcjo6aXNSZXBl YXRZU2V0LCAmRmlsbExheWVyOjpyZXBlYXRZLCAmRmlsbExheWVyOjpzZXRSZXBlYXRZLCAmRmls bExheWVyOjpjbGVhclJlcGVhdFksICZGaWxsTGF5ZXI6OmluaXRpYWxGaWxsUmVwZWF0WSwgJkNT U1RvU3R5bGVNYXA6Om1hcEZpbGxSZXBlYXRZPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQ cm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kU2l6ZSwgQXBwbHlQcm9wZXJ0eUZp bGxMYXllcjxGaWxsU2l6ZSwgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kU2l6ZSwgQmFja2dyb3VuZEZp bGxMYXllciwgJlJlbmRlclN0eWxlOjphY2Nlc3NCYWNrZ3JvdW5kTGF5ZXJzLCAmUmVuZGVyU3R5 bGU6OmJhY2tncm91bmRMYXllcnMsICZGaWxsTGF5ZXI6OmlzU2l6ZVNldCwgJkZpbGxMYXllcjo6 c2l6ZSwgJkZpbGxMYXllcjo6c2V0U2l6ZSwgJkZpbGxMYXllcjo6Y2xlYXJTaXplLCAmRmlsbExh eWVyOjppbml0aWFsRmlsbFNpemUsICZDU1NUb1N0eWxlTWFwOjptYXBGaWxsU2l6ZT46OmNyZWF0 ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9yZGVyQm90 dG9tQ29sb3IsIEFwcGx5UHJvcGVydHlDb2xvcjxOb0luaGVyaXRGcm9tUGFyZW50LCAmUmVuZGVy U3R5bGU6OmJvcmRlckJvdHRvbUNvbG9yLCAmUmVuZGVyU3R5bGU6OnNldEJvcmRlckJvdHRvbUNv bG9yLCAmUmVuZGVyU3R5bGU6OnNldFZpc2l0ZWRMaW5rQm9yZGVyQm90dG9tQ29sb3IsICZSZW5k ZXJTdHlsZTo6Y29sb3I+OjpjcmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFByb3BlcnR5SGFuZGxl cihDU1NQcm9wZXJ0eUJvcmRlckJvdHRvbUxlZnRSYWRpdXMsIEFwcGx5UHJvcGVydHlCb3JkZXJS YWRpdXM8JlJlbmRlclN0eWxlOjpib3JkZXJCb3R0b21MZWZ0UmFkaXVzLCAmUmVuZGVyU3R5bGU6 OnNldEJvcmRlckJvdHRvbUxlZnRSYWRpdXMsICZSZW5kZXJTdHlsZTo6aW5pdGlhbEJvcmRlclJh ZGl1cz46OmNyZWF0ZUhhbmRsZXIoKSk7Ci0gICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3Bl cnR5Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXMsIEFwcGx5UHJvcGVydHlCb3JkZXJSYWRpdXM8JlJl bmRlclN0eWxlOjpib3JkZXJCb3R0b21SaWdodFJhZGl1cywgJlJlbmRlclN0eWxlOjpzZXRCb3Jk ZXJCb3R0b21SaWdodFJhZGl1cywgJlJlbmRlclN0eWxlOjppbml0aWFsQm9yZGVyUmFkaXVzPjo6 Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3Jk ZXJJbWFnZU91dHNldCwgQXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9kaWZpZXI8Qm9yZGVySW1h Z2UsIE91dHNldD46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENT U1Byb3BlcnR5Qm9yZGVySW1hZ2VSZXBlYXQsIEFwcGx5UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlm aWVyPEJvcmRlckltYWdlLCBSZXBlYXQ+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3Bl cnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRlckltYWdlU2xpY2UsIEFwcGx5UHJvcGVydHlCb3Jk ZXJJbWFnZU1vZGlmaWVyPEJvcmRlckltYWdlLCBTbGljZT46OmNyZWF0ZUhhbmRsZXIoKSk7CkBA IC0yMzEwLDggKzIyNjAsNiBAQCBEZXByZWNhdGVkU3R5bGVCdWlsZGVyOjpEZXByZWNhdGVkU3R5 bGVCdWlsZGVyKCkKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJMZWZ0 Q29sb3IsIEFwcGx5UHJvcGVydHlDb2xvcjxOb0luaGVyaXRGcm9tUGFyZW50LCAmUmVuZGVyU3R5 bGU6OmJvcmRlckxlZnRDb2xvciwgJlJlbmRlclN0eWxlOjpzZXRCb3JkZXJMZWZ0Q29sb3IsICZS ZW5kZXJTdHlsZTo6c2V0VmlzaXRlZExpbmtCb3JkZXJMZWZ0Q29sb3IsICZSZW5kZXJTdHlsZTo6 Y29sb3I+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9w ZXJ0eUJvcmRlclJpZ2h0Q29sb3IsIEFwcGx5UHJvcGVydHlDb2xvcjxOb0luaGVyaXRGcm9tUGFy ZW50LCAmUmVuZGVyU3R5bGU6OmJvcmRlclJpZ2h0Q29sb3IsICZSZW5kZXJTdHlsZTo6c2V0Qm9y ZGVyUmlnaHRDb2xvciwgJlJlbmRlclN0eWxlOjpzZXRWaXNpdGVkTGlua0JvcmRlclJpZ2h0Q29s b3IsICZSZW5kZXJTdHlsZTo6Y29sb3I+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3Bl cnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRlclRvcENvbG9yLCBBcHBseVByb3BlcnR5Q29sb3I8 Tm9Jbmhlcml0RnJvbVBhcmVudCwgJlJlbmRlclN0eWxlOjpib3JkZXJUb3BDb2xvciwgJlJlbmRl clN0eWxlOjpzZXRCb3JkZXJUb3BDb2xvciwgJlJlbmRlclN0eWxlOjpzZXRWaXNpdGVkTGlua0Jv cmRlclRvcENvbG9yLCAmUmVuZGVyU3R5bGU6OmNvbG9yPjo6Y3JlYXRlSGFuZGxlcigpKTsKLSAg ICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJUb3BMZWZ0UmFkaXVzLCBBcHBs eVByb3BlcnR5Qm9yZGVyUmFkaXVzPCZSZW5kZXJTdHlsZTo6Ym9yZGVyVG9wTGVmdFJhZGl1cywg JlJlbmRlclN0eWxlOjpzZXRCb3JkZXJUb3BMZWZ0UmFkaXVzLCAmUmVuZGVyU3R5bGU6OmluaXRp YWxCb3JkZXJSYWRpdXM+OjpjcmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFByb3BlcnR5SGFuZGxl cihDU1NQcm9wZXJ0eUJvcmRlclRvcFJpZ2h0UmFkaXVzLCBBcHBseVByb3BlcnR5Qm9yZGVyUmFk aXVzPCZSZW5kZXJTdHlsZTo6Ym9yZGVyVG9wUmlnaHRSYWRpdXMsICZSZW5kZXJTdHlsZTo6c2V0 Qm9yZGVyVG9wUmlnaHRSYWRpdXMsICZSZW5kZXJTdHlsZTo6aW5pdGlhbEJvcmRlclJhZGl1cz46 OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Q2xp cCwgQXBwbHlQcm9wZXJ0eUNsaXA6OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlI YW5kbGVyKENTU1Byb3BlcnR5Q29sb3IsIEFwcGx5UHJvcGVydHlDb2xvcjxJbmhlcml0RnJvbVBh cmVudCwgJlJlbmRlclN0eWxlOjpjb2xvciwgJlJlbmRlclN0eWxlOjpzZXRDb2xvciwgJlJlbmRl clN0eWxlOjpzZXRWaXNpdGVkTGlua0NvbG9yLCAmUmVuZGVyU3R5bGU6OmludmFsaWRDb2xvciwg UmVuZGVyU3R5bGU6OmluaXRpYWxDb2xvcj46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJv cGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Q291bnRlckluY3JlbWVudCwgQXBwbHlQcm9wZXJ0eUNv dW50ZXI8SW5jcmVtZW50Pjo6Y3JlYXRlSGFuZGxlcigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9T dHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaAppbmRleCAyNDY4NmJiOTY0ZTI2NmE2Mzc3ZjY5MmQ1NjI4 ZmFmNjliNjRlYjIwLi4zMzYyNWQ4ZDcyNmNlYThmOWMxZmJkM2NlMDNkMzg2ZWRiN2JhYmNmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ29udmVydGVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckNvbnZlcnRlci5oCkBAIC0zMCw2ICsz MCw3IEBACiAjaW5jbHVkZSAiQ1NTQ2FsY3VsYXRpb25WYWx1ZS5oIgogI2luY2x1ZGUgIkNTU1By aW1pdGl2ZVZhbHVlLmgiCiAjaW5jbHVkZSAiTGVuZ3RoLmgiCisjaW5jbHVkZSAiUGFpci5oIgog I2luY2x1ZGUgIlN0eWxlUmVzb2x2ZXIuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNDMs NiArNDQsMTAgQEAgcHVibGljOgogICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBUPiBzdGF0aWMgVCBj b252ZXJ0Q29tcHV0ZWRMZW5ndGgoU3R5bGVSZXNvbHZlciYsIENTU1ZhbHVlJik7CiAgICAgdGVt cGxhdGUgPHR5cGVuYW1lIFQ+IHN0YXRpYyBUIGNvbnZlcnRMaW5lV2lkdGgoU3R5bGVSZXNvbHZl ciYsIENTU1ZhbHVlJik7CiAgICAgc3RhdGljIGZsb2F0IGNvbnZlcnRTcGFjaW5nKFN0eWxlUmVz b2x2ZXImLCBDU1NWYWx1ZSYpOworICAgIHN0YXRpYyBMZW5ndGhTaXplIGNvbnZlcnRSYWRpdXMo U3R5bGVSZXNvbHZlciYsIENTU1ZhbHVlJik7CisKK3ByaXZhdGU6CisgICAgc3RhdGljIExlbmd0 aCBjb252ZXJ0VG9SYWRpdXNMZW5ndGgoQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YSYsIENTU1By aW1pdGl2ZVZhbHVlJik7CiB9OwogCiBpbmxpbmUgTGVuZ3RoIFN0eWxlQnVpbGRlckNvbnZlcnRl cjo6Y29udmVydExlbmd0aChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYg dmFsdWUpCkBAIC0xNTQsNiArMTU5LDM1IEBAIGlubGluZSBmbG9hdCBTdHlsZUJ1aWxkZXJDb252 ZXJ0ZXI6OmNvbnZlcnRTcGFjaW5nKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsCiAgICAg cmV0dXJuIHByaW1pdGl2ZVZhbHVlLmNvbXB1dGVMZW5ndGg8ZmxvYXQ+KGNvbnZlcnNpb25EYXRh KTsKIH0KIAorTGVuZ3RoIFN0eWxlQnVpbGRlckNvbnZlcnRlcjo6Y29udmVydFRvUmFkaXVzTGVu Z3RoKENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmIGNvbnZlcnNpb25EYXRhLCBDU1NQcmltaXRp dmVWYWx1ZSYgdmFsdWUpCit7CisgICAgaWYgKHZhbHVlLmlzUGVyY2VudGFnZSgpKQorICAgICAg ICByZXR1cm4gTGVuZ3RoKHZhbHVlLmdldERvdWJsZVZhbHVlKCksIFBlcmNlbnQpOworICAgIGlm ICh2YWx1ZS5pc0NhbGN1bGF0ZWRQZXJjZW50YWdlV2l0aExlbmd0aCgpKQorICAgICAgICByZXR1 cm4gTGVuZ3RoKHZhbHVlLmNzc0NhbGNWYWx1ZSgpLT5jcmVhdGVDYWxjdWxhdGlvblZhbHVlKGNv bnZlcnNpb25EYXRhKSk7CisgICAgcmV0dXJuIHZhbHVlLmNvbXB1dGVMZW5ndGg8TGVuZ3RoPihj b252ZXJzaW9uRGF0YSk7Cit9CisKK0xlbmd0aFNpemUgU3R5bGVCdWlsZGVyQ29udmVydGVyOjpj b252ZXJ0UmFkaXVzKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlJiB2YWx1 ZSkKK3sKKyAgICBhdXRvJiBwcmltaXRpdmVWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZh bHVlPih2YWx1ZSk7CisgICAgUGFpciogcGFpciA9IHByaW1pdGl2ZVZhbHVlLmdldFBhaXJWYWx1 ZSgpOworICAgIEFTU0VSVChwYWlyKTsKKyAgICBBU1NFUlQocGFpci0+Zmlyc3QoKSk7CisgICAg QVNTRVJUKHBhaXItPnNlY29uZCgpKTsKKworICAgIENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEg Y29udmVyc2lvbkRhdGEgPSBzdHlsZVJlc29sdmVyLnN0YXRlKCkuY3NzVG9MZW5ndGhDb252ZXJz aW9uRGF0YSgpOworICAgIExlbmd0aCByYWRpdXNXaWR0aCA9IGNvbnZlcnRUb1JhZGl1c0xlbmd0 aChjb252ZXJzaW9uRGF0YSwgKnBhaXItPmZpcnN0KCkpOworICAgIExlbmd0aCByYWRpdXNIZWln aHQgPSBjb252ZXJ0VG9SYWRpdXNMZW5ndGgoY29udmVyc2lvbkRhdGEsICpwYWlyLT5zZWNvbmQo KSk7CisKKyAgICBBU1NFUlQoIXJhZGl1c1dpZHRoLmlzTmVnYXRpdmUoKSk7CisgICAgQVNTRVJU KCFyYWRpdXNIZWlnaHQuaXNOZWdhdGl2ZSgpKTsKKyAgICBpZiAocmFkaXVzV2lkdGguaXNaZXJv KCkgfHwgcmFkaXVzSGVpZ2h0LmlzWmVybygpKQorICAgICAgICByZXR1cm4gTGVuZ3RoU2l6ZShM ZW5ndGgoMCwgRml4ZWQpLCBMZW5ndGgoMCwgRml4ZWQpKTsKKworICAgIHJldHVybiBMZW5ndGhT aXplKHJhZGl1c1dpZHRoLCByYWRpdXNIZWlnaHQpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCiAKICNlbmRpZiAvLyBTdHlsZUJ1aWxkZXJDb252ZXJ0ZXJfaAo= 240494 2014-10-27 12:50:09 -0700 2014-10-27 13:03:50 -0700 Patch bug-138087-20141027125016.patch text/plain 1832 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1MjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODdkOTM4YmI5Mjc0YWI0 OTU0YjAyZThiMGRjNmM5Y2I2NGJkMmIxNC4uMDMxOWQ2MTZmNmNiMzk0YzUzN2FjMzRjMmU3Yjk1 NDQwYTc1ODY1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE0LTEwLTI3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVpbnRyb2R1Y2UgbnVsbCBj aGVjayByZW1vdmVkIGluIHIxNzUyMjIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzODA4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFJlaW50cm9kdWNlIG51bGwgY2hlY2sgcmVtb3ZlZCBpbiByMTc1MjIy IGFzIHNldmVyYWwgbGF5b3V0IHRlc3RzIGFyZQorICAgICAgICBjcmFzaGluZyBvbiB0aGUgYm90 cyB3aXRob3V0IHRoZW0uIEF0IGxlYXN0IHRoZSBQYWlyIHBvaW50ZXIgY2FuIGJlCisgICAgICAg IG51bGwgYWNjb3JkaW5nIHRvIHRoZSBhc3NlcnRpb24gaGl0cyBvbiB0aGUgYm90cy4KKworICAg ICAgICAqIGNzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0 eWxlQnVpbGRlckNvbnZlcnRlcjo6Y29udmVydFJhZGl1cyk6CisKKzIwMTQtMTAtMjcgIENocmlz IER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKwogICAgICAgICBNb3ZlIHJhZGl1cyBDU1MgcHJv cGVydGllcyB0byB0aGUgbmV3IFN0eWxlQnVpbGRlcgogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4MDg3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHls ZUJ1aWxkZXJDb252ZXJ0ZXIuaAppbmRleCAzMzYyNWQ4ZDcyNmNlYThmOWMxZmJkM2NlMDNkMzg2 ZWRiN2JhYmNmLi41Yzk3NTkyYWNkY2Q4M2Y5YTMxODdjMzI4YjczNWY4MzU4NTU1YjZiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ29udmVydGVyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckNvbnZlcnRlci5oCkBAIC0xNzIsOSArMTcy LDggQEAgTGVuZ3RoU2l6ZSBTdHlsZUJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRSYWRpdXMoU3R5 bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgQ1MKIHsKICAgICBhdXRvJiBwcmltaXRpdmVWYWx1 ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPih2YWx1ZSk7CiAgICAgUGFpciogcGFpciA9 IHByaW1pdGl2ZVZhbHVlLmdldFBhaXJWYWx1ZSgpOwotICAgIEFTU0VSVChwYWlyKTsKLSAgICBB U1NFUlQocGFpci0+Zmlyc3QoKSk7Ci0gICAgQVNTRVJUKHBhaXItPnNlY29uZCgpKTsKKyAgICBp ZiAoIXBhaXIgfHwgIXBhaXItPmZpcnN0KCkgfHwgIXBhaXItPnNlY29uZCgpKQorICAgICAgICBy ZXR1cm4gTGVuZ3RoU2l6ZShMZW5ndGgoMCwgRml4ZWQpLCBMZW5ndGgoMCwgRml4ZWQpKTsKIAog ICAgIENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEgY29udmVyc2lvbkRhdGEgPSBzdHlsZVJlc29s dmVyLnN0YXRlKCkuY3NzVG9MZW5ndGhDb252ZXJzaW9uRGF0YSgpOwogICAgIExlbmd0aCByYWRp dXNXaWR0aCA9IGNvbnZlcnRUb1JhZGl1c0xlbmd0aChjb252ZXJzaW9uRGF0YSwgKnBhaXItPmZp cnN0KCkpOwo=