173755 2017-06-22 22:06:00 -0700 [iOS] Potential crash under WebCore::notifyLowPowerModeChanged(WebCore::LowPowerModeNotifier*, bool) 2017-06-23 10:33:19 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez buildbot commit-queue ggaren kling koivisto mark.lam rniwa webkit-bug-importer oldest_to_newest 1322190 0 cdumez 2017-06-22 22:06:00 -0700 Potential crash under WebCore::notifyLowPowerModeChanged(WebCore::LowPowerModeNotifier*, bool): Thread 0 name: Dispatch queue: com.apple.main-thread Thread 0 Crashed ↩: 0 WebCore 0x000000018fc3c364 WebCore::notifyLowPowerModeChanged(WebCore::LowPowerModeNotifier*, bool) + 160 (Function.h:50) 1 WebCore 0x000000018fc3c358 WebCore::notifyLowPowerModeChanged(WebCore::LowPowerModeNotifier*, bool) + 148 (LowPowerModeNotifierIOS.mm:92) 2 JavaScriptCore 0x000000018dc70814 WTF::dispatchFunctionsFromMainThread() + 344 (Function.h:50) 3 Foundation 0x000000018763098c __NSThreadPerformPerform + 340 (NSThread.m:1254) 4 CoreFoundation 0x0000000186be547c __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE0_PERFORM_FUNCTION__ + 24 (CFRunLoop.c:1960) 5 CoreFoundation 0x0000000186be4cb0 __CFRunLoopDoSources0 + 276 (CFRunLoop.c:2006) 6 CoreFoundation 0x0000000186be2858 __CFRunLoopRun + 832 (CFRunLoop.c:2842) 7 CoreFoundation 0x0000000186b00c90 CFRunLoopRunSpecific + 436 (CFRunLoop.c:3148) 8 Foundation 0x000000018752f5c0 -[NSRunLoop(NSRunLoop) runMode:beforeDate:] + 304 (NSRunLoop.m:367) 9 Foundation 0x00000001875826d4 -[NSRunLoop(NSRunLoop) run] + 88 (NSRunLoop.m:389) 10 libxpc.dylib 0x00000001868af2b8 _xpc_objc_main + 516 (main.m:198) 11 libxpc.dylib 0x00000001868b12c4 xpc_main + 180 (init.c:1461) 12 com.apple.WebKit.WebContent 0x00000001011e359c main + 380 (XPCServiceMain.mm:148) 13 libdyld.dylib 0x00000001866262d0 start + 4 1322191 1 cdumez 2017-06-22 22:06:18 -0700 <rdar://problem/32940942> 1322195 2 313689 cdumez 2017-06-22 22:29:50 -0700 Created attachment 313689 WIP Patch 1322196 3 buildbot 2017-06-22 22:31:35 -0700 Attachment 313689 did not pass style-queue: ERROR: Source/WebCore/platform/ios/LowPowerModeNotifierIOS.mm:76: Missing spaces around : [whitespace/init] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1322297 4 313721 cdumez 2017-06-23 08:58:45 -0700 Created attachment 313721 WIP Patch 1322299 5 buildbot 2017-06-23 09:01:03 -0700 Attachment 313721 did not pass style-queue: ERROR: Source/WebCore/platform/ios/LowPowerModeNotifierIOS.mm:76: Missing spaces around : [whitespace/init] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1322319 6 313724 cdumez 2017-06-23 09:40:02 -0700 Created attachment 313724 Patch 1322320 7 buildbot 2017-06-23 09:41:45 -0700 Attachment 313724 did not pass style-queue: ERROR: Source/WebCore/platform/ios/LowPowerModeNotifierIOS.mm:76: Missing spaces around : [whitespace/init] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1322325 8 313724 mark.lam 2017-06-23 10:03:39 -0700 Comment on attachment 313724 Patch r=me 1322331 9 313724 commit-queue 2017-06-23 10:33:17 -0700 Comment on attachment 313724 Patch Clearing flags on attachment: 313724 Committed r218751: <http://trac.webkit.org/changeset/218751> 1322332 10 commit-queue 2017-06-23 10:33:19 -0700 All reviewed patches have been landed. Closing bug. 313689 2017-06-22 22:29:50 -0700 2017-06-23 08:58:45 -0700 WIP Patch 173755_lowPowerMode_WIP.patch text/plain 5073 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9haXJw bGF5LWJ1dHRvbi9haXJwbGF5LWJ1dHRvbi1vbi5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9k ZXJuLW1lZGlhLWNvbnRyb2xzL2FpcnBsYXktYnV0dG9uL2FpcnBsYXktYnV0dG9uLW9uLmh0bWwK aW5kZXggNzQ2N2IzN2I1ODQuLmViYjY3M2ZiMzZhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9t ZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvYWlycGxheS1idXR0b24vYWlycGxheS1idXR0b24t b24uaHRtbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvYWly cGxheS1idXR0b24vYWlycGxheS1idXR0b24tb24uaHRtbApAQCAtMTUsNiArMTUsNyBAQCBkb2N1 bWVudC5ib2R5LmFwcGVuZENoaWxkKGFpcnBsYXlCdXR0b24uZWxlbWVudCk7CiAKIGNvbnN0IGFp cnBsYXlDb2xvciA9IHdpbmRvdy5uYXZpZ2F0b3IucGxhdGZvcm0gPT09ICJNYWNJbnRlbCIgPyAi cmdiKDI3LCAxNzMsIDI0OCkiIDogInJnYigwLCAxMjIsIDI1NSkiOwogCitvbmxvYWQgPSBmdW5j dGlvbigpIHsKIHNob3VsZEJlY29tZUVxdWFsKCdhaXJwbGF5QnV0dG9uLmVsZW1lbnQuY2xhc3NM aXN0LmNvbnRhaW5zKCJvbiIpJywgInRydWUiLCAoKSA9PiB7CiAgICAgc2hvdWxkQmVjb21lRXF1 YWxUb1N0cmluZygid2luZG93LmdldENvbXB1dGVkU3R5bGUoYWlycGxheUJ1dHRvbi5lbGVtZW50 KS5iYWNrZ3JvdW5kQ29sb3IiLCAicmdiYSgwLCAwLCAwLCAwKSIsICgpID0+IHsKICAgICAgICAg c2hvdWxkQmVjb21lRXF1YWwoIndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGFpcnBsYXlCdXR0b24u aW1hZ2UuZWxlbWVudCkuYmFja2dyb3VuZENvbG9yIiwgImFpcnBsYXlDb2xvciIsICgpID0+IHsK QEAgLTIzLDYgKzI0LDcgQEAgc2hvdWxkQmVjb21lRXF1YWwoJ2FpcnBsYXlCdXR0b24uZWxlbWVu dC5jbGFzc0xpc3QuY29udGFpbnMoIm9uIiknLCAidHJ1ZSIsICgpID0KICAgICAgICAgfSk7CiAg ICAgfSk7CiB9KTsKK30KIAogc2V0VGltZW91dCgoKSA9PiB7CiAgICAgZGVidWcod2luZG93Lmdl dENvbXB1dGVkU3R5bGUoYWlycGxheUJ1dHRvbi5pbWFnZS5lbGVtZW50KS5iYWNrZ3JvdW5kQ29s b3IpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG93UG93ZXJNb2RlTm90 aWZpZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG93UG93ZXJNb2RlTm90aWZpZXIu Y3BwCmluZGV4IGE0NmRkMTNmYWI4Li42ZGU4ZjJhMjcyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vTG93UG93ZXJNb2RlTm90aWZpZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0xvd1Bvd2VyTW9kZU5vdGlmaWVyLmNwcApAQCAtMzQsNiArMzQsMTAgQEAg TG93UG93ZXJNb2RlTm90aWZpZXI6Okxvd1Bvd2VyTW9kZU5vdGlmaWVyKExvd1Bvd2VyTW9kZUNo YW5nZUNhbGxiYWNrJiYpCiB7CiB9CiAKK0xvd1Bvd2VyTW9kZU5vdGlmaWVyOjp+TG93UG93ZXJN b2RlTm90aWZpZXIoKQoreworfQorCiBib29sIExvd1Bvd2VyTW9kZU5vdGlmaWVyOjppc0xvd1Bv d2VyTW9kZUVuYWJsZWQoKSBjb25zdAogewogICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvd1Bvd2VyTW9kZU5vdGlmaWVyLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9Mb3dQb3dlck1vZGVOb3RpZmllci5oCmluZGV4IGVhNWJlZmZiYzlk Li5hMmJmMDhiN2ZlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG93UG93 ZXJNb2RlTm90aWZpZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb3dQb3dlck1v ZGVOb3RpZmllci5oCkBAIC00MCwxMyArNDAsMTQgQEAgY2xhc3MgTG93UG93ZXJNb2RlTm90aWZp ZXIgewogcHVibGljOgogICAgIHVzaW5nIExvd1Bvd2VyTW9kZUNoYW5nZUNhbGxiYWNrID0gV1RG OjpGdW5jdGlvbjx2b2lkKGJvb2wgaXNMb3dQb3dlck1vZGVFbmFibGVkKT47CiAgICAgV0VCQ09S RV9FWFBPUlQgZXhwbGljaXQgTG93UG93ZXJNb2RlTm90aWZpZXIoTG93UG93ZXJNb2RlQ2hhbmdl Q2FsbGJhY2smJik7CisgICAgfkxvd1Bvd2VyTW9kZU5vdGlmaWVyKCk7CiAKICAgICBXRUJDT1JF X0VYUE9SVCBib29sIGlzTG93UG93ZXJNb2RlRW5hYmxlZCgpIGNvbnN0OwogCiBwcml2YXRlOgog I2lmIFBMQVRGT1JNKElPUykKICAgICB2b2lkIG5vdGlmeUxvd1Bvd2VyTW9kZUNoYW5nZWQoYm9v bCk7Ci0gICAgZnJpZW5kIHZvaWQgbm90aWZ5TG93UG93ZXJNb2RlQ2hhbmdlZChMb3dQb3dlck1v ZGVOb3RpZmllciosIGJvb2wpOworICAgIGZyaWVuZCB2b2lkIG5vdGlmeUxvd1Bvd2VyTW9kZUNo YW5nZWQoTG93UG93ZXJNb2RlTm90aWZpZXImLCBib29sKTsKIAogICAgIFJldGFpblB0cjxXZWJM b3dQb3dlck1vZGVPYnNlcnZlcj4gbV9vYnNlcnZlcjsKICAgICBMb3dQb3dlck1vZGVDaGFuZ2VD YWxsYmFjayBtX2NhbGxiYWNrOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL0xvd1Bvd2VyTW9kZU5vdGlmaWVySU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL0xvd1Bvd2VyTW9kZU5vdGlmaWVySU9TLm1tCmluZGV4IGNkNjRjYTg2OTM2Li4yNDYxOGIx YmYxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL0xvd1Bvd2VyTW9k ZU5vdGlmaWVySU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9Mb3dQb3dl ck1vZGVOb3RpZmllcklPUy5tbQpAQCAtNDAsMTMgKzQwLDEzIEBAIEBlbmQKIEBpbXBsZW1lbnRh dGlvbiBXZWJMb3dQb3dlck1vZGVPYnNlcnZlciB7CiB9CiAKLS0gKFdlYkxvd1Bvd2VyTW9kZU9i c2VydmVyICopaW5pdFdpdGhOb3RpZmllcjooV2ViQ29yZTo6TG93UG93ZXJNb2RlTm90aWZpZXIg Kilub3RpZmllcgorLSAoV2ViTG93UG93ZXJNb2RlT2JzZXJ2ZXIgKilpbml0V2l0aE5vdGlmaWVy OihXZWJDb3JlOjpMb3dQb3dlck1vZGVOb3RpZmllciYpbm90aWZpZXIKIHsKICAgICBzZWxmID0g W3N1cGVyIGluaXRdOwogICAgIGlmICghc2VsZikKICAgICAgICAgcmV0dXJuIG5pbDsKIAotICAg IF9ub3RpZmllciA9IG5vdGlmaWVyOworICAgIF9ub3RpZmllciA9ICZub3RpZmllcjsKICAgICBf aXNMb3dQb3dlck1vZGVFbmFibGVkID0gW05TUHJvY2Vzc0luZm8gcHJvY2Vzc0luZm9dLmxvd1Bv d2VyTW9kZUVuYWJsZWQ7CiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVy XSBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihfZGlkUmVjZWl2ZUxvd1Bvd2Vy TW9kZUNoYW5nZSkgbmFtZTpOU1Byb2Nlc3NJbmZvUG93ZXJTdGF0ZURpZENoYW5nZU5vdGlmaWNh dGlvbiBvYmplY3Q6bmlsXTsKICAgICByZXR1cm4gc2VsZjsKQEAgLTYyLDggKzYyLDkgQEAgLSAo dm9pZClfZGlkUmVjZWl2ZUxvd1Bvd2VyTW9kZUNoYW5nZQogewogICAgIF9pc0xvd1Bvd2VyTW9k ZUVuYWJsZWQgPSBbTlNQcm9jZXNzSW5mbyBwcm9jZXNzSW5mb10ubG93UG93ZXJNb2RlRW5hYmxl ZDsKICAgICAvLyBXZSBuZWVkIHRvIG1ha2Ugc3VyZSB3ZSBub3RpZnkgdGhlIGNsaWVudCBvbiB0 aGUgbWFpbiB0aHJlYWQuCi0gICAgY2FsbE9uTWFpblRocmVhZChbbm90aWZpZXIgPSBfbm90aWZp ZXIsIGlzTG93UG93ZXJNb2RlRW5hYmxlZCA9IF9pc0xvd1Bvd2VyTW9kZUVuYWJsZWRdIHsKLSAg ICAgICAgbm90aWZ5TG93UG93ZXJNb2RlQ2hhbmdlZChub3RpZmllciwgaXNMb3dQb3dlck1vZGVF bmFibGVkKTsKKyAgICBjYWxsT25NYWluVGhyZWFkKFtzZWxmLCBwcm90ZWN0ZWRTZWxmID0gUmV0 YWluUHRyPFdlYkxvd1Bvd2VyTW9kZU9ic2VydmVyPihzZWxmKV0geworICAgICAgICBpZiAoX25v dGlmaWVyKQorICAgICAgICAgICAgbm90aWZ5TG93UG93ZXJNb2RlQ2hhbmdlZCgqX25vdGlmaWVy LCBfaXNMb3dQb3dlck1vZGVFbmFibGVkKTsKICAgICB9KTsKIH0KIApAQCAtNzIsMTEgKzczLDE2 IEBAIEBlbmQKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogTG93UG93ZXJNb2RlTm90aWZpZXI6Okxv d1Bvd2VyTW9kZU5vdGlmaWVyKExvd1Bvd2VyTW9kZUNoYW5nZUNhbGxiYWNrJiYgY2FsbGJhY2sp Ci0gICAgOiBtX29ic2VydmVyKGFkb3B0TlMoW1tXZWJMb3dQb3dlck1vZGVPYnNlcnZlciBhbGxv Y10gaW5pdFdpdGhOb3RpZmllcjogdGhpc10pKQorICAgIDogbV9vYnNlcnZlcihhZG9wdE5TKFtb V2ViTG93UG93ZXJNb2RlT2JzZXJ2ZXIgYWxsb2NdIGluaXRXaXRoTm90aWZpZXI6KnRoaXNdKSkK ICAgICAsIG1fY2FsbGJhY2soV1RGTW92ZShjYWxsYmFjaykpCiB7CiB9CiAKK0xvd1Bvd2VyTW9k ZU5vdGlmaWVyOjp+TG93UG93ZXJNb2RlTm90aWZpZXIoKQoreworICAgIG1fb2JzZXJ2ZXIubm90 aWZpZXIgPSBuaWw7Cit9CisKIGJvb2wgTG93UG93ZXJNb2RlTm90aWZpZXI6OmlzTG93UG93ZXJN b2RlRW5hYmxlZCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fb2JzZXJ2ZXIuZ2V0KCkuaXNMb3dQ b3dlck1vZGVFbmFibGVkOwpAQCAtODcsMTAgKzkzLDEwIEBAIHZvaWQgTG93UG93ZXJNb2RlTm90 aWZpZXI6Om5vdGlmeUxvd1Bvd2VyTW9kZUNoYW5nZWQoYm9vbCBlbmFibGVkKQogICAgIG1fY2Fs bGJhY2soZW5hYmxlZCk7CiB9CiAKLXZvaWQgbm90aWZ5TG93UG93ZXJNb2RlQ2hhbmdlZChMb3dQ b3dlck1vZGVOb3RpZmllciogbm90aWZpZXIsIGJvb2wgZW5hYmxlZCkKK3ZvaWQgbm90aWZ5TG93 UG93ZXJNb2RlQ2hhbmdlZChMb3dQb3dlck1vZGVOb3RpZmllciYgbm90aWZpZXIsIGJvb2wgZW5h YmxlZCkKIHsKICAgICBSRUxFQVNFX0xPRyhQZXJmb3JtYW5jZUxvZ2dpbmcsICJMb3cgcG93ZXIg bW9kZSBzdGF0ZSBoYXMgY2hhbmdlZCB0byAlZCIsIGVuYWJsZWQpOwotICAgIG5vdGlmaWVyLT5u b3RpZnlMb3dQb3dlck1vZGVDaGFuZ2VkKGVuYWJsZWQpOworICAgIG5vdGlmaWVyLm5vdGlmeUxv d1Bvd2VyTW9kZUNoYW5nZWQoZW5hYmxlZCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 313721 2017-06-23 08:58:45 -0700 2017-06-23 09:40:01 -0700 WIP Patch 173755_LowPowerMode_wip.patch text/plain 5046 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9haXJw bGF5LWJ1dHRvbi9haXJwbGF5LWJ1dHRvbi1vbi5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9k ZXJuLW1lZGlhLWNvbnRyb2xzL2FpcnBsYXktYnV0dG9uL2FpcnBsYXktYnV0dG9uLW9uLmh0bWwK aW5kZXggNzQ2N2IzN2I1ODQuLmViYjY3M2ZiMzZhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9t ZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvYWlycGxheS1idXR0b24vYWlycGxheS1idXR0b24t b24uaHRtbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvYWly cGxheS1idXR0b24vYWlycGxheS1idXR0b24tb24uaHRtbApAQCAtMTUsNiArMTUsNyBAQCBkb2N1 bWVudC5ib2R5LmFwcGVuZENoaWxkKGFpcnBsYXlCdXR0b24uZWxlbWVudCk7CiAKIGNvbnN0IGFp cnBsYXlDb2xvciA9IHdpbmRvdy5uYXZpZ2F0b3IucGxhdGZvcm0gPT09ICJNYWNJbnRlbCIgPyAi cmdiKDI3LCAxNzMsIDI0OCkiIDogInJnYigwLCAxMjIsIDI1NSkiOwogCitvbmxvYWQgPSBmdW5j dGlvbigpIHsKIHNob3VsZEJlY29tZUVxdWFsKCdhaXJwbGF5QnV0dG9uLmVsZW1lbnQuY2xhc3NM aXN0LmNvbnRhaW5zKCJvbiIpJywgInRydWUiLCAoKSA9PiB7CiAgICAgc2hvdWxkQmVjb21lRXF1 YWxUb1N0cmluZygid2luZG93LmdldENvbXB1dGVkU3R5bGUoYWlycGxheUJ1dHRvbi5lbGVtZW50 KS5iYWNrZ3JvdW5kQ29sb3IiLCAicmdiYSgwLCAwLCAwLCAwKSIsICgpID0+IHsKICAgICAgICAg c2hvdWxkQmVjb21lRXF1YWwoIndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGFpcnBsYXlCdXR0b24u aW1hZ2UuZWxlbWVudCkuYmFja2dyb3VuZENvbG9yIiwgImFpcnBsYXlDb2xvciIsICgpID0+IHsK QEAgLTIzLDYgKzI0LDcgQEAgc2hvdWxkQmVjb21lRXF1YWwoJ2FpcnBsYXlCdXR0b24uZWxlbWVu dC5jbGFzc0xpc3QuY29udGFpbnMoIm9uIiknLCAidHJ1ZSIsICgpID0KICAgICAgICAgfSk7CiAg ICAgfSk7CiB9KTsKK30KIAogc2V0VGltZW91dCgoKSA9PiB7CiAgICAgZGVidWcod2luZG93Lmdl dENvbXB1dGVkU3R5bGUoYWlycGxheUJ1dHRvbi5pbWFnZS5lbGVtZW50KS5iYWNrZ3JvdW5kQ29s b3IpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG93UG93ZXJNb2RlTm90 aWZpZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG93UG93ZXJNb2RlTm90aWZpZXIu Y3BwCmluZGV4IGE0NmRkMTNmYWI4Li42ZGU4ZjJhMjcyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vTG93UG93ZXJNb2RlTm90aWZpZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0xvd1Bvd2VyTW9kZU5vdGlmaWVyLmNwcApAQCAtMzQsNiArMzQsMTAgQEAg TG93UG93ZXJNb2RlTm90aWZpZXI6Okxvd1Bvd2VyTW9kZU5vdGlmaWVyKExvd1Bvd2VyTW9kZUNo YW5nZUNhbGxiYWNrJiYpCiB7CiB9CiAKK0xvd1Bvd2VyTW9kZU5vdGlmaWVyOjp+TG93UG93ZXJN b2RlTm90aWZpZXIoKQoreworfQorCiBib29sIExvd1Bvd2VyTW9kZU5vdGlmaWVyOjppc0xvd1Bv d2VyTW9kZUVuYWJsZWQoKSBjb25zdAogewogICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvd1Bvd2VyTW9kZU5vdGlmaWVyLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9Mb3dQb3dlck1vZGVOb3RpZmllci5oCmluZGV4IGVhNWJlZmZiYzlk Li4yY2RkYWFiZmRiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG93UG93 ZXJNb2RlTm90aWZpZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb3dQb3dlck1v ZGVOb3RpZmllci5oCkBAIC00MCwxMyArNDAsMTQgQEAgY2xhc3MgTG93UG93ZXJNb2RlTm90aWZp ZXIgewogcHVibGljOgogICAgIHVzaW5nIExvd1Bvd2VyTW9kZUNoYW5nZUNhbGxiYWNrID0gV1RG OjpGdW5jdGlvbjx2b2lkKGJvb2wgaXNMb3dQb3dlck1vZGVFbmFibGVkKT47CiAgICAgV0VCQ09S RV9FWFBPUlQgZXhwbGljaXQgTG93UG93ZXJNb2RlTm90aWZpZXIoTG93UG93ZXJNb2RlQ2hhbmdl Q2FsbGJhY2smJik7CisgICAgV0VCQ09SRV9FWFBPUlQgfkxvd1Bvd2VyTW9kZU5vdGlmaWVyKCk7 CiAKICAgICBXRUJDT1JFX0VYUE9SVCBib29sIGlzTG93UG93ZXJNb2RlRW5hYmxlZCgpIGNvbnN0 OwogCiBwcml2YXRlOgogI2lmIFBMQVRGT1JNKElPUykKICAgICB2b2lkIG5vdGlmeUxvd1Bvd2Vy TW9kZUNoYW5nZWQoYm9vbCk7Ci0gICAgZnJpZW5kIHZvaWQgbm90aWZ5TG93UG93ZXJNb2RlQ2hh bmdlZChMb3dQb3dlck1vZGVOb3RpZmllciosIGJvb2wpOworICAgIGZyaWVuZCB2b2lkIG5vdGlm eUxvd1Bvd2VyTW9kZUNoYW5nZWQoTG93UG93ZXJNb2RlTm90aWZpZXImLCBib29sKTsKIAogICAg IFJldGFpblB0cjxXZWJMb3dQb3dlck1vZGVPYnNlcnZlcj4gbV9vYnNlcnZlcjsKICAgICBMb3dQ b3dlck1vZGVDaGFuZ2VDYWxsYmFjayBtX2NhbGxiYWNrOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL0xvd1Bvd2VyTW9kZU5vdGlmaWVySU9TLm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL0xvd1Bvd2VyTW9kZU5vdGlmaWVySU9TLm1tCmluZGV4IGNkNjRj YTg2OTM2Li4yOWEzYWE4NjliNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL0xvd1Bvd2VyTW9kZU5vdGlmaWVySU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2lvcy9Mb3dQb3dlck1vZGVOb3RpZmllcklPUy5tbQpAQCAtNDAsMTMgKzQwLDEzIEBACiBA aW1wbGVtZW50YXRpb24gV2ViTG93UG93ZXJNb2RlT2JzZXJ2ZXIgewogfQogCi0tIChXZWJMb3dQ b3dlck1vZGVPYnNlcnZlciAqKWluaXRXaXRoTm90aWZpZXI6KFdlYkNvcmU6Okxvd1Bvd2VyTW9k ZU5vdGlmaWVyICopbm90aWZpZXIKKy0gKFdlYkxvd1Bvd2VyTW9kZU9ic2VydmVyICopaW5pdFdp dGhOb3RpZmllcjooV2ViQ29yZTo6TG93UG93ZXJNb2RlTm90aWZpZXImKW5vdGlmaWVyCiB7CiAg ICAgc2VsZiA9IFtzdXBlciBpbml0XTsKICAgICBpZiAoIXNlbGYpCiAgICAgICAgIHJldHVybiBu aWw7CiAKLSAgICBfbm90aWZpZXIgPSBub3RpZmllcjsKKyAgICBfbm90aWZpZXIgPSAmbm90aWZp ZXI7CiAgICAgX2lzTG93UG93ZXJNb2RlRW5hYmxlZCA9IFtOU1Byb2Nlc3NJbmZvIHByb2Nlc3NJ bmZvXS5sb3dQb3dlck1vZGVFbmFibGVkOwogICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVm YXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX2RpZFJlY2Vp dmVMb3dQb3dlck1vZGVDaGFuZ2UpIG5hbWU6TlNQcm9jZXNzSW5mb1Bvd2VyU3RhdGVEaWRDaGFu Z2VOb3RpZmljYXRpb24gb2JqZWN0Om5pbF07CiAgICAgcmV0dXJuIHNlbGY7CkBAIC02Miw4ICs2 Miw5IEBACiB7CiAgICAgX2lzTG93UG93ZXJNb2RlRW5hYmxlZCA9IFtOU1Byb2Nlc3NJbmZvIHBy b2Nlc3NJbmZvXS5sb3dQb3dlck1vZGVFbmFibGVkOwogICAgIC8vIFdlIG5lZWQgdG8gbWFrZSBz dXJlIHdlIG5vdGlmeSB0aGUgY2xpZW50IG9uIHRoZSBtYWluIHRocmVhZC4KLSAgICBjYWxsT25N YWluVGhyZWFkKFtub3RpZmllciA9IF9ub3RpZmllciwgaXNMb3dQb3dlck1vZGVFbmFibGVkID0g X2lzTG93UG93ZXJNb2RlRW5hYmxlZF0gewotICAgICAgICBub3RpZnlMb3dQb3dlck1vZGVDaGFu Z2VkKG5vdGlmaWVyLCBpc0xvd1Bvd2VyTW9kZUVuYWJsZWQpOworICAgIGNhbGxPbk1haW5UaHJl YWQoW3NlbGYsIHByb3RlY3RlZFNlbGYgPSBSZXRhaW5QdHI8V2ViTG93UG93ZXJNb2RlT2JzZXJ2 ZXI+KHNlbGYpXSB7CisgICAgICAgIGlmIChfbm90aWZpZXIpCisgICAgICAgICAgICBub3RpZnlM b3dQb3dlck1vZGVDaGFuZ2VkKCpfbm90aWZpZXIsIF9pc0xvd1Bvd2VyTW9kZUVuYWJsZWQpOwog ICAgIH0pOwogfQogCkBAIC03MiwxMSArNzMsMTYgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAog TG93UG93ZXJNb2RlTm90aWZpZXI6Okxvd1Bvd2VyTW9kZU5vdGlmaWVyKExvd1Bvd2VyTW9kZUNo YW5nZUNhbGxiYWNrJiYgY2FsbGJhY2spCi0gICAgOiBtX29ic2VydmVyKGFkb3B0TlMoW1tXZWJM b3dQb3dlck1vZGVPYnNlcnZlciBhbGxvY10gaW5pdFdpdGhOb3RpZmllcjogdGhpc10pKQorICAg IDogbV9vYnNlcnZlcihhZG9wdE5TKFtbV2ViTG93UG93ZXJNb2RlT2JzZXJ2ZXIgYWxsb2NdIGlu aXRXaXRoTm90aWZpZXI6KnRoaXNdKSkKICAgICAsIG1fY2FsbGJhY2soV1RGTW92ZShjYWxsYmFj aykpCiB7CiB9CiAKK0xvd1Bvd2VyTW9kZU5vdGlmaWVyOjp+TG93UG93ZXJNb2RlTm90aWZpZXIo KQoreworICAgIG1fb2JzZXJ2ZXIuZ2V0KCkubm90aWZpZXIgPSBuaWw7Cit9CisKIGJvb2wgTG93 UG93ZXJNb2RlTm90aWZpZXI6OmlzTG93UG93ZXJNb2RlRW5hYmxlZCgpIGNvbnN0CiB7CiAgICAg cmV0dXJuIG1fb2JzZXJ2ZXIuZ2V0KCkuaXNMb3dQb3dlck1vZGVFbmFibGVkOwpAQCAtODcsMTAg KzkzLDEwIEBAIHZvaWQgTG93UG93ZXJNb2RlTm90aWZpZXI6Om5vdGlmeUxvd1Bvd2VyTW9kZUNo YW5nZWQoYm9vbCBlbmFibGVkKQogICAgIG1fY2FsbGJhY2soZW5hYmxlZCk7CiB9CiAKLXZvaWQg bm90aWZ5TG93UG93ZXJNb2RlQ2hhbmdlZChMb3dQb3dlck1vZGVOb3RpZmllciogbm90aWZpZXIs IGJvb2wgZW5hYmxlZCkKK3ZvaWQgbm90aWZ5TG93UG93ZXJNb2RlQ2hhbmdlZChMb3dQb3dlck1v ZGVOb3RpZmllciYgbm90aWZpZXIsIGJvb2wgZW5hYmxlZCkKIHsKICAgICBSRUxFQVNFX0xPRyhQ ZXJmb3JtYW5jZUxvZ2dpbmcsICJMb3cgcG93ZXIgbW9kZSBzdGF0ZSBoYXMgY2hhbmdlZCB0byAl ZCIsIGVuYWJsZWQpOwotICAgIG5vdGlmaWVyLT5ub3RpZnlMb3dQb3dlck1vZGVDaGFuZ2VkKGVu YWJsZWQpOworICAgIG5vdGlmaWVyLm5vdGlmeUxvd1Bvd2VyTW9kZUNoYW5nZWQoZW5hYmxlZCk7 CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 313724 2017-06-23 09:40:02 -0700 2017-06-23 10:33:17 -0700 Patch bug-173755-20170623094002.patch text/plain 5926 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4NzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmFlZDczOTM4ODI2Y2I0 NmFiNWU0NGYwYmI0MWMzNzkxZWZlY2JmZi4uNjg2NjE2ODI4ZjliMmE5YzA4NmMyYWIzYzVlNDUz OTcxNmIxZDFlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDE3LTA2LTIzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgW2lPU10gUG90ZW50aWFsIGNy YXNoIHVuZGVyIFdlYkNvcmU6Om5vdGlmeUxvd1Bvd2VyTW9kZUNoYW5nZWQoV2ViQ29yZTo6TG93 UG93ZXJNb2RlTm90aWZpZXIqLCBib29sKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTczNzU1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjk0MDk0 Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUg Y3Jhc2ggd2FzIGhhcHBlbmluZyBiZWNhdXNlIHRoZSBXZWJMb3dQb3dlck1vZGVPYnNlcnZlciB3 b3VsZCBkaXNwYXRjaAorICAgICAgICBhIGxhbWJkYSB0byB0aGUgbWFpbiB0aHJlYWQgYnV0IHRo ZSBMb3dQb3dlck1vZGVOb3RpZmllciBvYmplY3QgY291bGQgYmUKKyAgICAgICAgZGVhZCBieSB0 aGUgdGltZSB3ZSBnZXQgdG8gdGhlIG1haW4gdGhyZWFkLgorCisgICAgICAgIFRvIGFkZHJlc3Mg dGhlIGlzc3VlLCBrZWVwIGEgc3Ryb25nIHJlZiB0byB0aGUgV2ViTG93UG93ZXJNb2RlT2JzZXJ2 ZXIgaW4KKyAgICAgICAgdGhlIGxhbWJkYSB3ZSBkaXNwYXRjaCB0byB0aGUgbWFpbiB0aHJlYWQg dG8gbWFrZSBzdXJlIGl0IHN0YXlzIGFsaXZlIHVudGlsCisgICAgICAgIHdlIGV4ZWN1dGUgdGhl IGxhbWJkYS4gSW4gdGhlIExvd1Bvd2VyTW9kZU5vdGlmaWVyIGRlc3RydWN0b3IsIHdlIG5vdyBy ZXNldAorICAgICAgICB0aGUgV2ViTG93UG93ZXJNb2RlT2JzZXJ2ZXIncyBub3RpZmllciBwb2lu dGVyIHRvIG5pbCBhbmQgSSBhZGRlZCBhIG51bGwKKyAgICAgICAgY2hlY2sgZm9yIHRoaXMgbm90 aWZpZXIgaW4gdGhlIGxhbWJkYS4KKworICAgICAgICAqIHBsYXRmb3JtL0xvd1Bvd2VyTW9kZU5v dGlmaWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxvd1Bvd2VyTW9kZU5vdGlmaWVyOjp+TG93 UG93ZXJNb2RlTm90aWZpZXIpOgorICAgICAgICAqIHBsYXRmb3JtL0xvd1Bvd2VyTW9kZU5vdGlm aWVyLmg6CisgICAgICAgICogcGxhdGZvcm0vaW9zL0xvd1Bvd2VyTW9kZU5vdGlmaWVySU9TLm1t OgorICAgICAgICAoLVtXZWJMb3dQb3dlck1vZGVPYnNlcnZlciBpbml0V2l0aE5vdGlmaWVyOl0p OgorICAgICAgICAoLVtXZWJMb3dQb3dlck1vZGVPYnNlcnZlciBfZGlkUmVjZWl2ZUxvd1Bvd2Vy TW9kZUNoYW5nZV0pOgorICAgICAgICAoV2ViQ29yZTo6TG93UG93ZXJNb2RlTm90aWZpZXI6Okxv d1Bvd2VyTW9kZU5vdGlmaWVyKToKKyAgICAgICAgKFdlYkNvcmU6Okxvd1Bvd2VyTW9kZU5vdGlm aWVyOjp+TG93UG93ZXJNb2RlTm90aWZpZXIpOgorICAgICAgICAoV2ViQ29yZTo6bm90aWZ5TG93 UG93ZXJNb2RlQ2hhbmdlZCk6CisKKzIwMTctMDYtMjMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFw cGxlLmNvbT4KKwogICAgICAgICBbbWFjLXdrMV0gcmVxdWVzdEFuaW1hdGlvbkZyYW1lIGNhbGxi YWNrcyBtYXkgbm90IGdldCBzZXJ2aWNlZAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTczNjI4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL0xvd1Bvd2VyTW9kZU5vdGlmaWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L0xvd1Bvd2VyTW9kZU5vdGlmaWVyLmNwcAppbmRleCBhNDZkZDEzZmFiODU4OGQyNmYxNDZlOWY5 ZDBjNzExNTk0NDI3MDgxLi42ZGU4ZjJhMjcyZDdjMGQ0ZTQ4Y2I4MzVhYjBiM2EzZWU3MGFhMTU4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb3dQb3dlck1vZGVOb3RpZmll ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG93UG93ZXJNb2RlTm90aWZpZXIu Y3BwCkBAIC0zNCw2ICszNCwxMCBAQCBMb3dQb3dlck1vZGVOb3RpZmllcjo6TG93UG93ZXJNb2Rl Tm90aWZpZXIoTG93UG93ZXJNb2RlQ2hhbmdlQ2FsbGJhY2smJikKIHsKIH0KIAorTG93UG93ZXJN b2RlTm90aWZpZXI6On5Mb3dQb3dlck1vZGVOb3RpZmllcigpCit7Cit9CisKIGJvb2wgTG93UG93 ZXJNb2RlTm90aWZpZXI6OmlzTG93UG93ZXJNb2RlRW5hYmxlZCgpIGNvbnN0CiB7CiAgICAgcmV0 dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG93UG93ZXJN b2RlTm90aWZpZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvd1Bvd2VyTW9kZU5vdGlm aWVyLmgKaW5kZXggZWE1YmVmZmJjOWQ0YWM0ZGE2ZTliNDIxYTRhNzc2NzkzZTRmOTdkMi4uMmNk ZGFhYmZkYjMwMjcwMzA3OGVjZmZmNjI1NTMzYjc3ZmE4MmY2NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vTG93UG93ZXJNb2RlTm90aWZpZXIuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9Mb3dQb3dlck1vZGVOb3RpZmllci5oCkBAIC00MCwxMyArNDAsMTQgQEAg Y2xhc3MgTG93UG93ZXJNb2RlTm90aWZpZXIgewogcHVibGljOgogICAgIHVzaW5nIExvd1Bvd2Vy TW9kZUNoYW5nZUNhbGxiYWNrID0gV1RGOjpGdW5jdGlvbjx2b2lkKGJvb2wgaXNMb3dQb3dlck1v ZGVFbmFibGVkKT47CiAgICAgV0VCQ09SRV9FWFBPUlQgZXhwbGljaXQgTG93UG93ZXJNb2RlTm90 aWZpZXIoTG93UG93ZXJNb2RlQ2hhbmdlQ2FsbGJhY2smJik7CisgICAgV0VCQ09SRV9FWFBPUlQg fkxvd1Bvd2VyTW9kZU5vdGlmaWVyKCk7CiAKICAgICBXRUJDT1JFX0VYUE9SVCBib29sIGlzTG93 UG93ZXJNb2RlRW5hYmxlZCgpIGNvbnN0OwogCiBwcml2YXRlOgogI2lmIFBMQVRGT1JNKElPUykK ICAgICB2b2lkIG5vdGlmeUxvd1Bvd2VyTW9kZUNoYW5nZWQoYm9vbCk7Ci0gICAgZnJpZW5kIHZv aWQgbm90aWZ5TG93UG93ZXJNb2RlQ2hhbmdlZChMb3dQb3dlck1vZGVOb3RpZmllciosIGJvb2wp OworICAgIGZyaWVuZCB2b2lkIG5vdGlmeUxvd1Bvd2VyTW9kZUNoYW5nZWQoTG93UG93ZXJNb2Rl Tm90aWZpZXImLCBib29sKTsKIAogICAgIFJldGFpblB0cjxXZWJMb3dQb3dlck1vZGVPYnNlcnZl cj4gbV9vYnNlcnZlcjsKICAgICBMb3dQb3dlck1vZGVDaGFuZ2VDYWxsYmFjayBtX2NhbGxiYWNr OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL0xvd1Bvd2VyTW9kZU5v dGlmaWVySU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL0xvd1Bvd2VyTW9kZU5v dGlmaWVySU9TLm1tCmluZGV4IGNkNjRjYTg2OTM2NjVjYzJjNWRmYzI5ODIyN2YzZmUxZTgwZGYx NDkuLjI5YTNhYTg2OWI1NzE0MDk2MGE5OTZiNWM5NWZmN2E5YzNlYWY3YjEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9Mb3dQb3dlck1vZGVOb3RpZmllcklPUy5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvTG93UG93ZXJNb2RlTm90aWZpZXJJT1Mu bW0KQEAgLTQwLDEzICs0MCwxMyBAQAogQGltcGxlbWVudGF0aW9uIFdlYkxvd1Bvd2VyTW9kZU9i c2VydmVyIHsKIH0KIAotLSAoV2ViTG93UG93ZXJNb2RlT2JzZXJ2ZXIgKilpbml0V2l0aE5vdGlm aWVyOihXZWJDb3JlOjpMb3dQb3dlck1vZGVOb3RpZmllciAqKW5vdGlmaWVyCistIChXZWJMb3dQ b3dlck1vZGVPYnNlcnZlciAqKWluaXRXaXRoTm90aWZpZXI6KFdlYkNvcmU6Okxvd1Bvd2VyTW9k ZU5vdGlmaWVyJilub3RpZmllcgogewogICAgIHNlbGYgPSBbc3VwZXIgaW5pdF07CiAgICAgaWYg KCFzZWxmKQogICAgICAgICByZXR1cm4gbmlsOwogCi0gICAgX25vdGlmaWVyID0gbm90aWZpZXI7 CisgICAgX25vdGlmaWVyID0gJm5vdGlmaWVyOwogICAgIF9pc0xvd1Bvd2VyTW9kZUVuYWJsZWQg PSBbTlNQcm9jZXNzSW5mbyBwcm9jZXNzSW5mb10ubG93UG93ZXJNb2RlRW5hYmxlZDsKICAgICBb W05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyOnNlbGYgc2Vs ZWN0b3I6QHNlbGVjdG9yKF9kaWRSZWNlaXZlTG93UG93ZXJNb2RlQ2hhbmdlKSBuYW1lOk5TUHJv Y2Vzc0luZm9Qb3dlclN0YXRlRGlkQ2hhbmdlTm90aWZpY2F0aW9uIG9iamVjdDpuaWxdOwogICAg IHJldHVybiBzZWxmOwpAQCAtNjIsOCArNjIsOSBAQAogewogICAgIF9pc0xvd1Bvd2VyTW9kZUVu YWJsZWQgPSBbTlNQcm9jZXNzSW5mbyBwcm9jZXNzSW5mb10ubG93UG93ZXJNb2RlRW5hYmxlZDsK ICAgICAvLyBXZSBuZWVkIHRvIG1ha2Ugc3VyZSB3ZSBub3RpZnkgdGhlIGNsaWVudCBvbiB0aGUg bWFpbiB0aHJlYWQuCi0gICAgY2FsbE9uTWFpblRocmVhZChbbm90aWZpZXIgPSBfbm90aWZpZXIs IGlzTG93UG93ZXJNb2RlRW5hYmxlZCA9IF9pc0xvd1Bvd2VyTW9kZUVuYWJsZWRdIHsKLSAgICAg ICAgbm90aWZ5TG93UG93ZXJNb2RlQ2hhbmdlZChub3RpZmllciwgaXNMb3dQb3dlck1vZGVFbmFi bGVkKTsKKyAgICBjYWxsT25NYWluVGhyZWFkKFtzZWxmLCBwcm90ZWN0ZWRTZWxmID0gUmV0YWlu UHRyPFdlYkxvd1Bvd2VyTW9kZU9ic2VydmVyPihzZWxmKV0geworICAgICAgICBpZiAoX25vdGlm aWVyKQorICAgICAgICAgICAgbm90aWZ5TG93UG93ZXJNb2RlQ2hhbmdlZCgqX25vdGlmaWVyLCBf aXNMb3dQb3dlck1vZGVFbmFibGVkKTsKICAgICB9KTsKIH0KIApAQCAtNzIsMTEgKzczLDE2IEBA CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIExvd1Bvd2VyTW9kZU5vdGlmaWVyOjpMb3dQb3dlck1v ZGVOb3RpZmllcihMb3dQb3dlck1vZGVDaGFuZ2VDYWxsYmFjayYmIGNhbGxiYWNrKQotICAgIDog bV9vYnNlcnZlcihhZG9wdE5TKFtbV2ViTG93UG93ZXJNb2RlT2JzZXJ2ZXIgYWxsb2NdIGluaXRX aXRoTm90aWZpZXI6IHRoaXNdKSkKKyAgICA6IG1fb2JzZXJ2ZXIoYWRvcHROUyhbW1dlYkxvd1Bv d2VyTW9kZU9ic2VydmVyIGFsbG9jXSBpbml0V2l0aE5vdGlmaWVyOip0aGlzXSkpCiAgICAgLCBt X2NhbGxiYWNrKFdURk1vdmUoY2FsbGJhY2spKQogewogfQogCitMb3dQb3dlck1vZGVOb3RpZmll cjo6fkxvd1Bvd2VyTW9kZU5vdGlmaWVyKCkKK3sKKyAgICBtX29ic2VydmVyLmdldCgpLm5vdGlm aWVyID0gbmlsOworfQorCiBib29sIExvd1Bvd2VyTW9kZU5vdGlmaWVyOjppc0xvd1Bvd2VyTW9k ZUVuYWJsZWQoKSBjb25zdAogewogICAgIHJldHVybiBtX29ic2VydmVyLmdldCgpLmlzTG93UG93 ZXJNb2RlRW5hYmxlZDsKQEAgLTg3LDEwICs5MywxMCBAQCB2b2lkIExvd1Bvd2VyTW9kZU5vdGlm aWVyOjpub3RpZnlMb3dQb3dlck1vZGVDaGFuZ2VkKGJvb2wgZW5hYmxlZCkKICAgICBtX2NhbGxi YWNrKGVuYWJsZWQpOwogfQogCi12b2lkIG5vdGlmeUxvd1Bvd2VyTW9kZUNoYW5nZWQoTG93UG93 ZXJNb2RlTm90aWZpZXIqIG5vdGlmaWVyLCBib29sIGVuYWJsZWQpCit2b2lkIG5vdGlmeUxvd1Bv d2VyTW9kZUNoYW5nZWQoTG93UG93ZXJNb2RlTm90aWZpZXImIG5vdGlmaWVyLCBib29sIGVuYWJs ZWQpCiB7CiAgICAgUkVMRUFTRV9MT0coUGVyZm9ybWFuY2VMb2dnaW5nLCAiTG93IHBvd2VyIG1v ZGUgc3RhdGUgaGFzIGNoYW5nZWQgdG8gJWQiLCBlbmFibGVkKTsKLSAgICBub3RpZmllci0+bm90 aWZ5TG93UG93ZXJNb2RlQ2hhbmdlZChlbmFibGVkKTsKKyAgICBub3RpZmllci5ub3RpZnlMb3dQ b3dlck1vZGVDaGFuZ2VkKGVuYWJsZWQpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==