162754 2016-09-29 14:32:25 -0700 More logging to diagnose "WebKit encountered an internal error" messages 2016-10-03 17:35:13 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 krollin krollin commit-queue ddkilzer koivisto ryanhaddad webkit-bug-importer oldest_to_newest 1234982 0 krollin 2016-09-29 14:32:25 -0700 We’re getting a number of reports about the “WebKit encountered an internal error" message, and it would be good if we had logging that captured information that explicitly told us why this error message appeared (if that doesn’t already exist). <rdar://problem/28460265> 1235443 1 290390 krollin 2016-09-30 15:01:08 -0700 Created attachment 290390 Patch 1235774 2 290390 koivisto 2016-10-03 06:00:58 -0700 Comment on attachment 290390 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=290390&action=review > Source/WebKit2/Platform/mac/SharedMemoryMac.cpp:110 > LOG_ERROR("Failed to allocate mach_vm_allocate shared memory (%zu bytes). %s (%x)", size, mach_error_string(kr), kr); > + RELEASE_LOG_ERROR(VirtualMemory, "%p - SharedMemory::allocate: Failed to allocate mach_vm_allocate shared memory (%zu bytes). %{public}s (%x)", nullptr, size, mach_error_string(kr), kr); Why do we need both log messages? > Source/WebKit2/Platform/mac/SharedMemoryMac.cpp:144 > LOG_ERROR("Failed to create a mach port for shared memory. %s (%x)", mach_error_string(kr), kr); > + RELEASE_LOG_ERROR(VirtualMemory, "%p - SharedMemory::makeMemoryEntry: Failed to create a mach port for shared memory. %{public}s (%x)", nullptr, mach_error_string(kr), kr); Here too? > Source/WebKit2/Platform/mac/SharedMemoryMac.cpp:200 > + ASSERT(kr == KERN_SUCCESS); Why not just ASSERT_NOT_REACHED? 1235855 3 krollin 2016-10-03 12:31:13 -0700 (In reply to comment #2) > Comment on attachment 290390 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=290390&action=review > > > Source/WebKit2/Platform/mac/SharedMemoryMac.cpp:110 > > LOG_ERROR("Failed to allocate mach_vm_allocate shared memory (%zu bytes). %s (%x)", size, mach_error_string(kr), kr); > > + RELEASE_LOG_ERROR(VirtualMemory, "%p - SharedMemory::allocate: Failed to allocate mach_vm_allocate shared memory (%zu bytes). %{public}s (%x)", nullptr, size, mach_error_string(kr), kr); > > Why do we need both log messages? > > > Source/WebKit2/Platform/mac/SharedMemoryMac.cpp:144 > > LOG_ERROR("Failed to create a mach port for shared memory. %s (%x)", mach_error_string(kr), kr); > > + RELEASE_LOG_ERROR(VirtualMemory, "%p - SharedMemory::makeMemoryEntry: Failed to create a mach port for shared memory. %{public}s (%x)", nullptr, mach_error_string(kr), kr); > > Here too? The idea is to preserve previous logging that people may be using for pre-existing workflows. The RELEASE_LOG macros always log and will send their output to the Console app. The other logging shows up in syslog, the terminal, or Xcode console. It's also conditionally enabled. I didn't want to upset the workflows of people who rely on any of that. There are other instances of double-logging in: NetworkResourceLoader.cpp, WebLoaderStrategy.cpp, WebResourceLoader.cpp After having a chat with Chris about this double-logging, he felt that it would be OK to take the old logging out. It's not generally used, we're transitioning to the os_log-based logging, almost everyone is now living on a system that supports os_log, etc. So I'll take it out of this patch and will file a bug to cover the other cases. > > Source/WebKit2/Platform/mac/SharedMemoryMac.cpp:200 > > + ASSERT(kr == KERN_SUCCESS); > > Why not just ASSERT_NOT_REACHED? I considered ASSERT(false) (which seems equivalent to ASSERT_NOT_REACHED), but I felt that it was not as good as ASSERT(kr == KERN_SUCCESS). The latter will result in a message that says "ASSERTION FAILED: kr == KERN_SUCCESS". This message includes more information on what failed and so seems better. But ASSERT_NOT_REACHED seems more consistent with existing usage, so I'll switch to that. 1235928 4 290525 krollin 2016-10-03 14:46:10 -0700 Created attachment 290525 Patch 1235942 5 290525 commit-queue 2016-10-03 15:20:51 -0700 Comment on attachment 290525 Patch Clearing flags on attachment: 290525 Committed r206754: <http://trac.webkit.org/changeset/206754> 1235943 6 commit-queue 2016-10-03 15:20:55 -0700 All reviewed patches have been landed. Closing bug. 1235963 7 ryanhaddad 2016-10-03 15:56:12 -0700 Reverted r206754 for reason: This change broke the El Capitan and Yosemite debug builds. Committed r206757: <http://trac.webkit.org/changeset/206757> 1235965 8 ryanhaddad 2016-10-03 15:59:13 -0700 (In reply to comment #7) > Reverted r206754 for reason: > > This change broke the El Capitan and Yosemite debug builds. > > Committed r206757: <http://trac.webkit.org/changeset/206757> EWS seems to have caught this on the first patch. Here is a link to failure: https://build.webkit.org/builders/Apple%20Yosemite%20Debug%20%28Build%29/builds/19189 1235973 9 krollin 2016-10-03 16:07:39 -0700 I've updated the patch to use the previous code on older systems. 1235978 10 290533 krollin 2016-10-03 16:10:55 -0700 Created attachment 290533 Patch 1236004 11 290533 commit-queue 2016-10-03 17:35:08 -0700 Comment on attachment 290533 Patch Clearing flags on attachment: 290533 Committed r206762: <http://trac.webkit.org/changeset/206762> 1236005 12 commit-queue 2016-10-03 17:35:13 -0700 All reviewed patches have been landed. Closing bug. 290390 2016-09-30 15:01:08 -0700 2016-10-03 14:46:07 -0700 Patch bug-162754-20160930145805.patch text/plain 9498 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2NTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmRlY2QzZDgwZjZlM2E4 MDJkOTYxYTEzYmE3MWUwODRmZDIyNzc5My4uMTkzZTVhZTg2OWU3ODMwZjVjNTJhZWFiZjc3YjJi ZmQxZWI0OWM0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE2LTA5LTMwICBLZWl0 aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAgICAgICBNb3JlIGxvZ2dpbmcgdG8g ZGlhZ25vc2UgIldlYktpdCBlbmNvdW50ZXJlZCBhbiBpbnRlcm5hbCBlcnJvciIgbWVzc2FnZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2Mjc1NAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBtb3Jl IGxvZ2dpbmcgYXJvdW5kIGNhbGxzIHRvIGludGVybmFsRXJyb3IsIGFzIHdlbGwgYXMgc29tZQor ICAgICAgICBsb3ctbGV2ZWwgbG9nZ2luZyBhcm91bmQgU2hhcmVkTWVtb3J5LCBhbmQgbWFjaF92 bV9tYXAgaW4gcGFydGljdWxhci4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtS ZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRl cjo6c3RhcnROZXR3b3JrTG9hZCk6CisgICAgICAgICogUGxhdGZvcm0vTG9nZ2luZy5oOgorICAg ICAgICAqIFBsYXRmb3JtL21hYy9TaGFyZWRNZW1vcnlNYWMuY3BwOgorICAgICAgICAoV2ViS2l0 OjpTaGFyZWRNZW1vcnk6OmFsbG9jYXRlKToKKyAgICAgICAgKFdlYktpdDo6bWFrZU1lbW9yeUVu dHJ5KToKKyAgICAgICAgKFdlYktpdDo6U2hhcmVkTWVtb3J5OjptYXApOgorICAgICAgICAoV2Vi S2l0OjpTaGFyZWRNZW1vcnk6On5TaGFyZWRNZW1vcnkpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv TmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRl clN0cmF0ZWd5OjpuZXR3b3JrUHJvY2Vzc0NyYXNoZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJM b2FkZXJTdHJhdGVneTo6bG9hZFJlc291cmNlU3luY2hyb25vdXNseSk6CisgICAgICAgICogV2Vi UHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNvdXJjZSk6CisKIDIwMTYtMDktMjkgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIE5ldHdv cmtTZXNzaW9uOiBIVFRQIGF1dGhlbnRpY2F0aW9uIGRvZXNuJ3Qgd29yayBpZiBQUk9URUNUSU9O X1NQQUNFX0FVVEhfQ0FMTEJBQ0sgaXMgbm90IGVuYWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDBh NzEyNjNlNTdjMjM5N2RlZTg2ZWE1YTY3ZWYwNjIyYjQxYWQ3NDkuLmFkMjgwYTNkMDM4ZTZiNjM0 OWM3YWU5MmU1N2E4MDEyZDZmN2Y3NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcApAQCAtNTAsNiArNTAsNyBA QAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKICNkZWZpbmUgUkVMRUFTRV9MT0dfSUZfQUxM T1dFRChmbXQsIC4uLikgUkVMRUFTRV9MT0dfSUYoaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCks IE5ldHdvcmssICIlcCAtIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6IiBmbXQsIHRoaXMsICMjX19W QV9BUkdTX18pCisjZGVmaW5lIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoZm10LCAuLi4p IFJFTEVBU0VfTE9HX0VSUk9SX0lGKGlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpLCBOZXR3b3Jr LCAiJXAgLSBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OiIgZm10LCB0aGlzLCAjI19fVkFfQVJHU19f KQogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtMjE4LDcgKzIxOSw3IEBAIHZvaWQgTmV0d29y a1Jlc291cmNlTG9hZGVyOjpzdGFydE5ldHdvcmtMb2FkKGNvbnN0IFJlc291cmNlUmVxdWVzdCYg cmVxdWVzdCkKICAgICBhdXRvKiBuZXR3b3JrU2Vzc2lvbiA9IFNlc3Npb25UcmFja2VyOjpuZXR3 b3JrU2Vzc2lvbihwYXJhbWV0ZXJzLnNlc3Npb25JRCk7CiAgICAgaWYgKCFuZXR3b3JrU2Vzc2lv bikgewogICAgICAgICBXVEZMb2dBbHdheXMoIkF0dGVtcHRlZCB0byBjcmVhdGUgYSBOZXR3b3Jr TG9hZCB3aXRoIGEgc2Vzc2lvbiAoaWQ9JSIgUFJJdTY0ICIpIHRoYXQgZG9lcyBub3QgZXhpc3Qu IiwgcGFyYW1ldGVycy5zZXNzaW9uSUQuc2Vzc2lvbklEKCkpOwotICAgICAgICBSRUxFQVNFX0xP R19JRl9BTExPV0VEKCJzdGFydE5ldHdvcmtMb2FkOiBBdHRlbXB0ZWQgdG8gY3JlYXRlIGEgTmV0 d29ya0xvYWQgd2l0aCBhIHNlc3Npb24gdGhhdCBkb2VzIG5vdCBleGlzdCAocGFnZUlEID0gJSIg UFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAi LCBzZXNzaW9uSUQ9JSIgUFJJdTY0ICIpIiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCwgbV9wYXJh bWV0ZXJzLndlYkZyYW1lSUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCBwYXJhbWV0ZXJzLnNl c3Npb25JRC5zZXNzaW9uSUQoKSk7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9X RUQoInN0YXJ0TmV0d29ya0xvYWQ6IEF0dGVtcHRlZCB0byBjcmVhdGUgYSBOZXR3b3JrTG9hZCB3 aXRoIGEgc2Vzc2lvbiB0aGF0IGRvZXMgbm90IGV4aXN0IChwYWdlSUQgPSAlIiBQUkl1NjQgIiwg ZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIsIHNlc3Npb25J RD0lIiBQUkl1NjQgIikiLCBtX3BhcmFtZXRlcnMud2ViUGFnZUlELCBtX3BhcmFtZXRlcnMud2Vi RnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIsIHBhcmFtZXRlcnMuc2Vzc2lvbklELnNl c3Npb25JRCgpKTsKICAgICAgICAgZGlkRmFpbExvYWRpbmcoaW50ZXJuYWxFcnJvcihyZXF1ZXN0 LnVybCgpKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9QbGF0Zm9ybS9Mb2dnaW5nLmggYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Mb2dnaW5n LmgKaW5kZXggYjJjMTFhMmFiYzIwYzhiNDQ4OTFjOWZmNGJiNzJkZTU2OTA1NGM0OS4uODcyMDI3 MmRkMjZiNDllNTYzZWRjYWQwNjNkYWE0ZjI2ZWViNGNhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvUGxhdGZvcm0vTG9nZ2luZy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0xv Z2dpbmcuaApAQCAtNjcsNiArNjcsNyBAQCBleHRlcm4gIkMiIHsKICAgICBNKFN0b3JhZ2VBUEkp IFwKICAgICBNKFRleHRJbnB1dCkgXAogICAgIE0oVmlld0dlc3R1cmVzKSBcCisgICAgTShWaXJ0 dWFsTWVtb3J5KSBcCiAgICAgTShWaXNpYmxlUmVjdHMpIFwKIAogV0VCS0lUMl9MT0dfQ0hBTk5F TFMoREVDTEFSRV9MT0dfQ0hBTk5FTCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRm b3JtL21hYy9TaGFyZWRNZW1vcnlNYWMuY3BwIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vbWFj L1NoYXJlZE1lbW9yeU1hYy5jcHAKaW5kZXggNTQ0ZmI5OTUyMzJhNTIwNzA2YjQwZWE1MzQ1NzM5 MmI3NjM3ZjNhZi4uNjRjYWYwNTlkY2NhODY2OTZkMmRhNGI4NDRmODM0NDdiNTIxMmJlNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vbWFjL1NoYXJlZE1lbW9yeU1hYy5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vbWFjL1NoYXJlZE1lbW9yeU1hYy5jcHAKQEAg LTI4LDYgKzI4LDcgQEAKIAogI2luY2x1ZGUgIkRlY29kZXIuaCIKICNpbmNsdWRlICJFbmNvZGVy LmgiCisjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIk1hY2hQb3J0LmgiCiAjaW5jbHVk ZSA8V2ViQ29yZS9NYWNoU2VuZFJpZ2h0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9NYWNoVk1TUEku aD4KQEAgLTEwNiw2ICsxMDcsNyBAQCBSZWZQdHI8U2hhcmVkTWVtb3J5PiBTaGFyZWRNZW1vcnk6 OmFsbG9jYXRlKHNpemVfdCBzaXplKQogICAgIGtlcm5fcmV0dXJuX3Qga3IgPSBtYWNoX3ZtX2Fs bG9jYXRlKG1hY2hfdGFza19zZWxmKCksICZhZGRyZXNzLCByb3VuZF9wYWdlKHNpemUpLCBWTV9G TEFHU19BTllXSEVSRSk7CiAgICAgaWYgKGtyICE9IEtFUk5fU1VDQ0VTUykgewogICAgICAgICBM T0dfRVJST1IoIkZhaWxlZCB0byBhbGxvY2F0ZSBtYWNoX3ZtX2FsbG9jYXRlIHNoYXJlZCBtZW1v cnkgKCV6dSBieXRlcykuICVzICgleCkiLCBzaXplLCBtYWNoX2Vycm9yX3N0cmluZyhrciksIGty KTsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoVmlydHVhbE1lbW9yeSwgIiVwIC0gU2hhcmVk TWVtb3J5OjphbGxvY2F0ZTogRmFpbGVkIHRvIGFsbG9jYXRlIG1hY2hfdm1fYWxsb2NhdGUgc2hh cmVkIG1lbW9yeSAoJXp1IGJ5dGVzKS4gJXtwdWJsaWN9cyAoJXgpIiwgbnVsbHB0ciwgc2l6ZSwg bWFjaF9lcnJvcl9zdHJpbmcoa3IpLCBrcik7CiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAg IH0KIApAQCAtMTM5LDYgKzE0MSw3IEBAIHN0YXRpYyBXZWJDb3JlOjpNYWNoU2VuZFJpZ2h0IG1h a2VNZW1vcnlFbnRyeShzaXplX3Qgc2l6ZSwgdm1fb2Zmc2V0X3Qgb2Zmc2V0LCBTCiAgICAga2Vy bl9yZXR1cm5fdCBrciA9IG1hY2hfbWFrZV9tZW1vcnlfZW50cnlfNjQobWFjaF90YXNrX3NlbGYo KSwgJm1lbW9yeU9iamVjdFNpemUsIG9mZnNldCwgbWFjaFByb3RlY3Rpb24ocHJvdGVjdGlvbikg fCBWTV9QUk9UX0lTX01BU0sgfCBNQVBfTUVNX1ZNX1NIQVJFLCAmcG9ydCwgcGFyZW50RW50cnkp OwogICAgIGlmIChrciAhPSBLRVJOX1NVQ0NFU1MpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWls ZWQgdG8gY3JlYXRlIGEgbWFjaCBwb3J0IGZvciBzaGFyZWQgbWVtb3J5LiAlcyAoJXgpIiwgbWFj aF9lcnJvcl9zdHJpbmcoa3IpLCBrcik7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFZpcnR1 YWxNZW1vcnksICIlcCAtIFNoYXJlZE1lbW9yeTo6bWFrZU1lbW9yeUVudHJ5OiBGYWlsZWQgdG8g Y3JlYXRlIGEgbWFjaCBwb3J0IGZvciBzaGFyZWQgbWVtb3J5LiAle3B1YmxpY31zICgleCkiLCBu dWxscHRyLCBtYWNoX2Vycm9yX3N0cmluZyhrciksIGtyKTsKICAgICAgICAgcmV0dXJuIHsgfTsK ICAgICB9CiAKQEAgLTE3NCw4ICsxNzcsMTAgQEAgUmVmUHRyPFNoYXJlZE1lbW9yeT4gU2hhcmVk TWVtb3J5OjptYXAoY29uc3QgSGFuZGxlJiBoYW5kbGUsIFByb3RlY3Rpb24gcHJvdGVjdGkKICAg ICB2bV9wcm90X3Qgdm1Qcm90ZWN0aW9uID0gbWFjaFByb3RlY3Rpb24ocHJvdGVjdGlvbik7CiAg ICAgbWFjaF92bV9hZGRyZXNzX3QgbWFwcGVkQWRkcmVzcyA9IDA7CiAgICAga2Vybl9yZXR1cm5f dCBrciA9IG1hY2hfdm1fbWFwKG1hY2hfdGFza19zZWxmKCksICZtYXBwZWRBZGRyZXNzLCByb3Vu ZF9wYWdlKGhhbmRsZS5tX3NpemUpLCAwLCBWTV9GTEFHU19BTllXSEVSRSwgaGFuZGxlLm1fcG9y dCwgMCwgZmFsc2UsIHZtUHJvdGVjdGlvbiwgdm1Qcm90ZWN0aW9uLCBWTV9JTkhFUklUX05PTkUp OwotICAgIGlmIChrciAhPSBLRVJOX1NVQ0NFU1MpCisgICAgaWYgKGtyICE9IEtFUk5fU1VDQ0VT UykgeworICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihWaXJ0dWFsTWVtb3J5LCAiJXAgLSBTaGFy ZWRNZW1vcnk6Om1hcDogRmFpbGVkIHRvIG1hcCBzaGFyZWQgbWVtb3J5LiAle3B1YmxpY31zICgl eCkiLCBudWxscHRyLCBtYWNoX2Vycm9yX3N0cmluZyhrciksIGtyKTsKICAgICAgICAgcmV0dXJu IG51bGxwdHI7CisgICAgfQogCiAgICAgYXV0byBzaGFyZWRNZW1vcnkoYWRvcHRSZWYoKm5ldyBT aGFyZWRNZW1vcnkpKTsKICAgICBzaGFyZWRNZW1vcnktPm1fc2l6ZSA9IGhhbmRsZS5tX3NpemU7 CkBAIC0xOTAsMTIgKzE5NSwxOCBAQCBTaGFyZWRNZW1vcnk6On5TaGFyZWRNZW1vcnkoKQogewog ICAgIGlmIChtX2RhdGEpIHsKICAgICAgICAga2Vybl9yZXR1cm5fdCBrciA9IG1hY2hfdm1fZGVh bGxvY2F0ZShtYWNoX3Rhc2tfc2VsZigpLCB0b1ZNQWRkcmVzcyhtX2RhdGEpLCByb3VuZF9wYWdl KG1fc2l6ZSkpOwotICAgICAgICBBU1NFUlRfVU5VU0VEKGtyLCBrciA9PSBLRVJOX1NVQ0NFU1Mp OworICAgICAgICBpZiAoa3IgIT0gS0VSTl9TVUNDRVNTKSB7CisgICAgICAgICAgICBSRUxFQVNF X0xPR19FUlJPUihWaXJ0dWFsTWVtb3J5LCAiJXAgLSBTaGFyZWRNZW1vcnk6On5TaGFyZWRNZW1v cnk6IEZhaWxlZCB0byBkZWFsbG9jYXRlIHNoYXJlZCBtZW1vcnkuICV7cHVibGljfXMgKCV4KSIs IHRoaXMsIG1hY2hfZXJyb3Jfc3RyaW5nKGtyKSwga3IpOworICAgICAgICAgICAgQVNTRVJUKGty ID09IEtFUk5fU1VDQ0VTUyk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAobV9wb3J0KSB7 CiAgICAgICAgIGtlcm5fcmV0dXJuX3Qga3IgPSBtYWNoX3BvcnRfZGVhbGxvY2F0ZShtYWNoX3Rh c2tfc2VsZigpLCBtX3BvcnQpOwotICAgICAgICBBU1NFUlRfVU5VU0VEKGtyLCBrciA9PSBLRVJO X1NVQ0NFU1MpOworICAgICAgICBpZiAoa3IgIT0gS0VSTl9TVUNDRVNTKSB7CisgICAgICAgICAg ICBSRUxFQVNFX0xPR19FUlJPUihWaXJ0dWFsTWVtb3J5LCAiJXAgLSBTaGFyZWRNZW1vcnk6On5T aGFyZWRNZW1vcnk6IEZhaWxlZCB0byBkZWFsbG9jYXRlIHBvcnQuICV7cHVibGljfXMgKCV4KSIs IHRoaXMsIG1hY2hfZXJyb3Jfc3RyaW5nKGtyKSwga3IpOworICAgICAgICAgICAgQVNTRVJUKGty ID09IEtFUk5fU1VDQ0VTUyk7CisgICAgICAgIH0KICAgICB9ICAgICAgICAKIH0KICAgICAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJh dGVneS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3Ry YXRlZ3kuY3BwCmluZGV4IGE5YTg0M2RlMTJiMmJkOTk1ODU0MDM4Zjc4NjFlODM4YjFhNWEzZWUu LmEzZTRiOTk2NWY2NTc5NGUwM2M4YTI2NWQ2NGVlZjg3OWZjOTc4MDUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNw cApAQCAtMzA1LDYgKzMwNSw4IEBAIHZvaWQgV2ViTG9hZGVyU3RyYXRlZ3k6OnJlc3VtZVBlbmRp bmdSZXF1ZXN0cygpCiAKIHZvaWQgV2ViTG9hZGVyU3RyYXRlZ3k6Om5ldHdvcmtQcm9jZXNzQ3Jh c2hlZCgpCiB7CisgICAgUkVMRUFTRV9MT0dfRVJST1IoTmV0d29yaywgIldlYkxvYWRlclN0cmF0 ZWd5OjpuZXR3b3JrUHJvY2Vzc0NyYXNoZWQ6IGZhaWxpbmcgYWxsIHBlbmRpbmcgcmVzb3VyY2Ug bG9hZGVycyIpOworCiAgICAgZm9yIChhdXRvJiBsb2FkZXIgOiBtX3dlYlJlc291cmNlTG9hZGVy cykKICAgICAgICAgc2NoZWR1bGVJbnRlcm5hbGx5RmFpbGVkTG9hZCgqbG9hZGVyLnZhbHVlLT5y ZXNvdXJjZUxvYWRlcigpKTsKIApAQCAtMzM3LDYgKzMzOSw3IEBAIHZvaWQgV2ViTG9hZGVyU3Ry YXRlZ3k6OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoTmV0d29ya2luZ0NvbnRleHQqIGNvbnRl eHQsIHVuCiAgICAgSGFuZ0RldGVjdGlvbkRpc2FibGVyIGhhbmdEZXRlY3Rpb25EaXNhYmxlcjsK IAogICAgIGlmICghV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkubmV0d29ya0Nvbm5lY3Rpb24oKS5j b25uZWN0aW9uKCkuc2VuZFN5bmMoTWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9j ZXNzOjpQZXJmb3JtU3luY2hyb25vdXNMb2FkKGxvYWRQYXJhbWV0ZXJzKSwgTWVzc2FnZXM6Ok5l dHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpQZXJmb3JtU3luY2hyb25vdXNMb2FkOjpSZXBs eShlcnJvciwgcmVzcG9uc2UsIGRhdGEpLCAwKSkgeworICAgICAgICBSRUxFQVNFX0xPR19FUlJP Ul9JRl9BTExPV0VEKGxvYWRQYXJhbWV0ZXJzLnNlc3Npb25JRCwgImxvYWRSZXNvdXJjZVN5bmNo cm9ub3VzbHk6IGZhaWxlZCBzZW5kaW5nIHN5bmNocm9ub3VzIG5ldHdvcmsgcHJvY2VzcyBtZXNz YWdlIChwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJj ZUlEID0gJSIgUFJJdTY0ICIpIiwgbG9hZFBhcmFtZXRlcnMud2ViUGFnZUlELCBsb2FkUGFyYW1l dGVycy53ZWJGcmFtZUlELCBsb2FkUGFyYW1ldGVycy5pZGVudGlmaWVyKTsKICAgICAgICAgcmVz cG9uc2UgPSBSZXNvdXJjZVJlc3BvbnNlKCk7CiAgICAgICAgIGVycm9yID0gaW50ZXJuYWxFcnJv cihyZXF1ZXN0LnVybCgpKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmNwcAppbmRleCBhZTdhMTBkZjFlNDIz MzExOGIwNzJmMGJhZGE2YjI3M2NhYWNlYTI4Li4yOTg3OWI0NDk3NDgzYjI2YjAzYzMzZTE5ZjU3 MWY2YTYxZjc5YzJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdv cmsvV2ViUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv TmV0d29yay9XZWJSZXNvdXJjZUxvYWRlci5jcHAKQEAgLTE5OSw2ICsxOTksNyBAQCB2b2lkIFdl YlJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzb3VyY2UoY29uc3QgU2hhcmVhYmxlUmVzb3Vy Y2U6OkhhbmRsZSYgaGFuZAogCiAgICAgaWYgKCFidWZmZXIpIHsKICAgICAgICAgTE9HX0VSUk9S KCJVbmFibGUgdG8gY3JlYXRlIGJ1ZmZlciBmcm9tIFNoYXJlYWJsZVJlc291cmNlIHNlbnQgZnJv bSB0aGUgbmV0d29yayBwcm9jZXNzLiIpOworICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VE KCJkaWRSZWNlaXZlUmVzb3VyY2U6IFVuYWJsZSB0byBjcmVhdGUgU2hhcmVkQnVmZmVyIChwYWdl SUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIg UFJJdTY0ICIpIiwgbV90cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELCBtX3RyYWNraW5nUGFyYW1l dGVycy5mcmFtZUlELCBtX3RyYWNraW5nUGFyYW1ldGVycy5yZXNvdXJjZUlEKTsKICAgICAgICAg bV9jb3JlTG9hZGVyLT5kaWRGYWlsKGludGVybmFsRXJyb3IobV9jb3JlTG9hZGVyLT5yZXF1ZXN0 KCkudXJsKCkpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K 290525 2016-10-03 14:46:10 -0700 2016-10-03 16:10:52 -0700 Patch bug-162754-20161003144301.patch text/plain 9493 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2NzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzE4MTA1NTgzY2QyMDJi NjhmMGU5NjNjYzQ3NGE4YTgxY2U5N2M0Ny4uZmE0Yzc5YzM1N2I0MWJmYjg2YWZlZTQ2MjgzNjVi NTY0MWU4M2UzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE2LTEwLTAzICBLZWl0 aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAgICAgICBNb3JlIGxvZ2dpbmcgdG8g ZGlhZ25vc2UgIldlYktpdCBlbmNvdW50ZXJlZCBhbiBpbnRlcm5hbCBlcnJvciIgbWVzc2FnZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2Mjc1NAor CisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIEFkZCBtb3Jl IGxvZ2dpbmcgYXJvdW5kIGNhbGxzIHRvIGludGVybmFsRXJyb3IsIGFzIHdlbGwgYXMgc29tZQor ICAgICAgICBsb3ctbGV2ZWwgbG9nZ2luZyBhcm91bmQgU2hhcmVkTWVtb3J5LCBhbmQgbWFjaF92 bV9tYXAgaW4gcGFydGljdWxhci4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtS ZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRl cjo6c3RhcnROZXR3b3JrTG9hZCk6CisgICAgICAgICogUGxhdGZvcm0vTG9nZ2luZy5oOgorICAg ICAgICAqIFBsYXRmb3JtL21hYy9TaGFyZWRNZW1vcnlNYWMuY3BwOgorICAgICAgICAoV2ViS2l0 OjpTaGFyZWRNZW1vcnk6OmFsbG9jYXRlKToKKyAgICAgICAgKFdlYktpdDo6bWFrZU1lbW9yeUVu dHJ5KToKKyAgICAgICAgKFdlYktpdDo6U2hhcmVkTWVtb3J5OjptYXApOgorICAgICAgICAoV2Vi S2l0OjpTaGFyZWRNZW1vcnk6On5TaGFyZWRNZW1vcnkpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv TmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRl clN0cmF0ZWd5OjpuZXR3b3JrUHJvY2Vzc0NyYXNoZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJM b2FkZXJTdHJhdGVneTo6bG9hZFJlc291cmNlU3luY2hyb25vdXNseSk6CisgICAgICAgICogV2Vi UHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNvdXJjZSk6CisKIDIwMTYtMTAtMDMgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtTT1VQ XSBDbGVhbnVwIHBlcnNpc3RlbnQgY3JlZGVudGlhbCBzdG9yYWdlIGNvZGUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3Bw CmluZGV4IDBhNzEyNjNlNTdjMjM5N2RlZTg2ZWE1YTY3ZWYwNjIyYjQxYWQ3NDkuLmFkMjgwYTNk MDM4ZTZiNjM0OWM3YWU5MmU1N2E4MDEyZDZmN2Y3NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcApAQCAtNTAs NiArNTAsNyBAQAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKICNkZWZpbmUgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRChmbXQsIC4uLikgUkVMRUFTRV9MT0dfSUYoaXNBbHdheXNPbkxvZ2dpbmdB bGxvd2VkKCksIE5ldHdvcmssICIlcCAtIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6IiBmbXQsIHRo aXMsICMjX19WQV9BUkdTX18pCisjZGVmaW5lIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQo Zm10LCAuLi4pIFJFTEVBU0VfTE9HX0VSUk9SX0lGKGlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgp LCBOZXR3b3JrLCAiJXAgLSBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OiIgZm10LCB0aGlzLCAjI19f VkFfQVJHU19fKQogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtMjE4LDcgKzIxOSw3IEBAIHZv aWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpzdGFydE5ldHdvcmtMb2FkKGNvbnN0IFJlc291cmNl UmVxdWVzdCYgcmVxdWVzdCkKICAgICBhdXRvKiBuZXR3b3JrU2Vzc2lvbiA9IFNlc3Npb25UcmFj a2VyOjpuZXR3b3JrU2Vzc2lvbihwYXJhbWV0ZXJzLnNlc3Npb25JRCk7CiAgICAgaWYgKCFuZXR3 b3JrU2Vzc2lvbikgewogICAgICAgICBXVEZMb2dBbHdheXMoIkF0dGVtcHRlZCB0byBjcmVhdGUg YSBOZXR3b3JrTG9hZCB3aXRoIGEgc2Vzc2lvbiAoaWQ9JSIgUFJJdTY0ICIpIHRoYXQgZG9lcyBu b3QgZXhpc3QuIiwgcGFyYW1ldGVycy5zZXNzaW9uSUQuc2Vzc2lvbklEKCkpOwotICAgICAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKCJzdGFydE5ldHdvcmtMb2FkOiBBdHRlbXB0ZWQgdG8gY3Jl YXRlIGEgTmV0d29ya0xvYWQgd2l0aCBhIHNlc3Npb24gdGhhdCBkb2VzIG5vdCBleGlzdCAocGFn ZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUi IFBSSXU2NCAiLCBzZXNzaW9uSUQ9JSIgUFJJdTY0ICIpIiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJ RCwgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCBwYXJh bWV0ZXJzLnNlc3Npb25JRC5zZXNzaW9uSUQoKSk7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9S X0lGX0FMTE9XRUQoInN0YXJ0TmV0d29ya0xvYWQ6IEF0dGVtcHRlZCB0byBjcmVhdGUgYSBOZXR3 b3JrTG9hZCB3aXRoIGEgc2Vzc2lvbiB0aGF0IGRvZXMgbm90IGV4aXN0IChwYWdlSUQgPSAlIiBQ Ukl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIs IHNlc3Npb25JRD0lIiBQUkl1NjQgIikiLCBtX3BhcmFtZXRlcnMud2ViUGFnZUlELCBtX3BhcmFt ZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIsIHBhcmFtZXRlcnMuc2Vz c2lvbklELnNlc3Npb25JRCgpKTsKICAgICAgICAgZGlkRmFpbExvYWRpbmcoaW50ZXJuYWxFcnJv cihyZXF1ZXN0LnVybCgpKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Mb2dnaW5nLmggYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9y bS9Mb2dnaW5nLmgKaW5kZXggYjJjMTFhMmFiYzIwYzhiNDQ4OTFjOWZmNGJiNzJkZTU2OTA1NGM0 OS4uODcyMDI3MmRkMjZiNDllNTYzZWRjYWQwNjNkYWE0ZjI2ZWViNGNhYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvUGxhdGZvcm0vTG9nZ2luZy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1Bs YXRmb3JtL0xvZ2dpbmcuaApAQCAtNjcsNiArNjcsNyBAQCBleHRlcm4gIkMiIHsKICAgICBNKFN0 b3JhZ2VBUEkpIFwKICAgICBNKFRleHRJbnB1dCkgXAogICAgIE0oVmlld0dlc3R1cmVzKSBcCisg ICAgTShWaXJ0dWFsTWVtb3J5KSBcCiAgICAgTShWaXNpYmxlUmVjdHMpIFwKIAogV0VCS0lUMl9M T0dfQ0hBTk5FTFMoREVDTEFSRV9MT0dfQ0hBTk5FTCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1BsYXRmb3JtL21hYy9TaGFyZWRNZW1vcnlNYWMuY3BwIGIvU291cmNlL1dlYktpdDIvUGxh dGZvcm0vbWFjL1NoYXJlZE1lbW9yeU1hYy5jcHAKaW5kZXggNTQ0ZmI5OTUyMzJhNTIwNzA2YjQw ZWE1MzQ1NzM5MmI3NjM3ZjNhZi4uZDg4NTczMzJmYjkwMTE1ODQ4ZjM4MGM3YjdhNTM5YTczMjYz MThkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vbWFjL1NoYXJlZE1lbW9y eU1hYy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vbWFjL1NoYXJlZE1lbW9yeU1h Yy5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2luY2x1ZGUgIkRlY29kZXIuaCIKICNpbmNsdWRl ICJFbmNvZGVyLmgiCisjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIk1hY2hQb3J0Lmgi CiAjaW5jbHVkZSA8V2ViQ29yZS9NYWNoU2VuZFJpZ2h0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9N YWNoVk1TUEkuaD4KQEAgLTEwNSw3ICsxMDYsNyBAQCBSZWZQdHI8U2hhcmVkTWVtb3J5PiBTaGFy ZWRNZW1vcnk6OmFsbG9jYXRlKHNpemVfdCBzaXplKQogICAgIG1hY2hfdm1fYWRkcmVzc190IGFk ZHJlc3M7CiAgICAga2Vybl9yZXR1cm5fdCBrciA9IG1hY2hfdm1fYWxsb2NhdGUobWFjaF90YXNr X3NlbGYoKSwgJmFkZHJlc3MsIHJvdW5kX3BhZ2Uoc2l6ZSksIFZNX0ZMQUdTX0FOWVdIRVJFKTsK ICAgICBpZiAoa3IgIT0gS0VSTl9TVUNDRVNTKSB7Ci0gICAgICAgIExPR19FUlJPUigiRmFpbGVk IHRvIGFsbG9jYXRlIG1hY2hfdm1fYWxsb2NhdGUgc2hhcmVkIG1lbW9yeSAoJXp1IGJ5dGVzKS4g JXMgKCV4KSIsIHNpemUsIG1hY2hfZXJyb3Jfc3RyaW5nKGtyKSwga3IpOworICAgICAgICBSRUxF QVNFX0xPR19FUlJPUihWaXJ0dWFsTWVtb3J5LCAiJXAgLSBTaGFyZWRNZW1vcnk6OmFsbG9jYXRl OiBGYWlsZWQgdG8gYWxsb2NhdGUgbWFjaF92bV9hbGxvY2F0ZSBzaGFyZWQgbWVtb3J5ICglenUg Ynl0ZXMpLiAle3B1YmxpY31zICgleCkiLCBudWxscHRyLCBzaXplLCBtYWNoX2Vycm9yX3N0cmlu ZyhrciksIGtyKTsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCkBAIC0xMzgsNyAr MTM5LDcgQEAgc3RhdGljIFdlYkNvcmU6Ok1hY2hTZW5kUmlnaHQgbWFrZU1lbW9yeUVudHJ5KHNp emVfdCBzaXplLCB2bV9vZmZzZXRfdCBvZmZzZXQsIFMKICAgICBtYWNoX3BvcnRfdCBwb3J0Owog ICAgIGtlcm5fcmV0dXJuX3Qga3IgPSBtYWNoX21ha2VfbWVtb3J5X2VudHJ5XzY0KG1hY2hfdGFz a19zZWxmKCksICZtZW1vcnlPYmplY3RTaXplLCBvZmZzZXQsIG1hY2hQcm90ZWN0aW9uKHByb3Rl Y3Rpb24pIHwgVk1fUFJPVF9JU19NQVNLIHwgTUFQX01FTV9WTV9TSEFSRSwgJnBvcnQsIHBhcmVu dEVudHJ5KTsKICAgICBpZiAoa3IgIT0gS0VSTl9TVUNDRVNTKSB7Ci0gICAgICAgIExPR19FUlJP UigiRmFpbGVkIHRvIGNyZWF0ZSBhIG1hY2ggcG9ydCBmb3Igc2hhcmVkIG1lbW9yeS4gJXMgKCV4 KSIsIG1hY2hfZXJyb3Jfc3RyaW5nKGtyKSwga3IpOworICAgICAgICBSRUxFQVNFX0xPR19FUlJP UihWaXJ0dWFsTWVtb3J5LCAiJXAgLSBTaGFyZWRNZW1vcnk6Om1ha2VNZW1vcnlFbnRyeTogRmFp bGVkIHRvIGNyZWF0ZSBhIG1hY2ggcG9ydCBmb3Igc2hhcmVkIG1lbW9yeS4gJXtwdWJsaWN9cyAo JXgpIiwgbnVsbHB0ciwgbWFjaF9lcnJvcl9zdHJpbmcoa3IpLCBrcik7CiAgICAgICAgIHJldHVy biB7IH07CiAgICAgfQogCkBAIC0xNzQsOCArMTc1LDEwIEBAIFJlZlB0cjxTaGFyZWRNZW1vcnk+ IFNoYXJlZE1lbW9yeTo6bWFwKGNvbnN0IEhhbmRsZSYgaGFuZGxlLCBQcm90ZWN0aW9uIHByb3Rl Y3RpCiAgICAgdm1fcHJvdF90IHZtUHJvdGVjdGlvbiA9IG1hY2hQcm90ZWN0aW9uKHByb3RlY3Rp b24pOwogICAgIG1hY2hfdm1fYWRkcmVzc190IG1hcHBlZEFkZHJlc3MgPSAwOwogICAgIGtlcm5f cmV0dXJuX3Qga3IgPSBtYWNoX3ZtX21hcChtYWNoX3Rhc2tfc2VsZigpLCAmbWFwcGVkQWRkcmVz cywgcm91bmRfcGFnZShoYW5kbGUubV9zaXplKSwgMCwgVk1fRkxBR1NfQU5ZV0hFUkUsIGhhbmRs ZS5tX3BvcnQsIDAsIGZhbHNlLCB2bVByb3RlY3Rpb24sIHZtUHJvdGVjdGlvbiwgVk1fSU5IRVJJ VF9OT05FKTsKLSAgICBpZiAoa3IgIT0gS0VSTl9TVUNDRVNTKQorICAgIGlmIChrciAhPSBLRVJO X1NVQ0NFU1MpIHsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoVmlydHVhbE1lbW9yeSwgIiVw IC0gU2hhcmVkTWVtb3J5OjptYXA6IEZhaWxlZCB0byBtYXAgc2hhcmVkIG1lbW9yeS4gJXtwdWJs aWN9cyAoJXgpIiwgbnVsbHB0ciwgbWFjaF9lcnJvcl9zdHJpbmcoa3IpLCBrcik7CiAgICAgICAg IHJldHVybiBudWxscHRyOworICAgIH0KIAogICAgIGF1dG8gc2hhcmVkTWVtb3J5KGFkb3B0UmVm KCpuZXcgU2hhcmVkTWVtb3J5KSk7CiAgICAgc2hhcmVkTWVtb3J5LT5tX3NpemUgPSBoYW5kbGUu bV9zaXplOwpAQCAtMTkwLDEyICsxOTMsMTggQEAgU2hhcmVkTWVtb3J5Ojp+U2hhcmVkTWVtb3J5 KCkKIHsKICAgICBpZiAobV9kYXRhKSB7CiAgICAgICAgIGtlcm5fcmV0dXJuX3Qga3IgPSBtYWNo X3ZtX2RlYWxsb2NhdGUobWFjaF90YXNrX3NlbGYoKSwgdG9WTUFkZHJlc3MobV9kYXRhKSwgcm91 bmRfcGFnZShtX3NpemUpKTsKLSAgICAgICAgQVNTRVJUX1VOVVNFRChrciwga3IgPT0gS0VSTl9T VUNDRVNTKTsKKyAgICAgICAgaWYgKGtyICE9IEtFUk5fU1VDQ0VTUykgeworICAgICAgICAgICAg UkVMRUFTRV9MT0dfRVJST1IoVmlydHVhbE1lbW9yeSwgIiVwIC0gU2hhcmVkTWVtb3J5Ojp+U2hh cmVkTWVtb3J5OiBGYWlsZWQgdG8gZGVhbGxvY2F0ZSBzaGFyZWQgbWVtb3J5LiAle3B1YmxpY31z ICgleCkiLCB0aGlzLCBtYWNoX2Vycm9yX3N0cmluZyhrciksIGtyKTsKKyAgICAgICAgICAgIEFT U0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICB9CiAgICAgfQogCiAgICAgaWYgKG1fcG9ydCkg ewogICAgICAgICBrZXJuX3JldHVybl90IGtyID0gbWFjaF9wb3J0X2RlYWxsb2NhdGUobWFjaF90 YXNrX3NlbGYoKSwgbV9wb3J0KTsKLSAgICAgICAgQVNTRVJUX1VOVVNFRChrciwga3IgPT0gS0VS Tl9TVUNDRVNTKTsKKyAgICAgICAgaWYgKGtyICE9IEtFUk5fU1VDQ0VTUykgeworICAgICAgICAg ICAgUkVMRUFTRV9MT0dfRVJST1IoVmlydHVhbE1lbW9yeSwgIiVwIC0gU2hhcmVkTWVtb3J5Ojp+ U2hhcmVkTWVtb3J5OiBGYWlsZWQgdG8gZGVhbGxvY2F0ZSBwb3J0LiAle3B1YmxpY31zICgleCki LCB0aGlzLCBtYWNoX2Vycm9yX3N0cmluZyhrciksIGtyKTsKKyAgICAgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOworICAgICAgICB9CiAgICAgfSAgICAgICAgCiB9CiAgICAgCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3ku Y3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5 LmNwcAppbmRleCBhOWE4NDNkZTEyYjJiZDk5NTg1NDAzOGY3ODYxZTgzOGIxYTVhM2VlLi5hM2U0 Yjk5NjVmNjU3OTRlMDNjOGEyNjVkNjRlZWY4NzlmYzk3ODA1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKQEAg LTMwNSw2ICszMDUsOCBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpyZXN1bWVQZW5kaW5nUmVx dWVzdHMoKQogCiB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpuZXR3b3JrUHJvY2Vzc0NyYXNoZWQo KQogeworICAgIFJFTEVBU0VfTE9HX0VSUk9SKE5ldHdvcmssICJXZWJMb2FkZXJTdHJhdGVneTo6 bmV0d29ya1Byb2Nlc3NDcmFzaGVkOiBmYWlsaW5nIGFsbCBwZW5kaW5nIHJlc291cmNlIGxvYWRl cnMiKTsKKwogICAgIGZvciAoYXV0byYgbG9hZGVyIDogbV93ZWJSZXNvdXJjZUxvYWRlcnMpCiAg ICAgICAgIHNjaGVkdWxlSW50ZXJuYWxseUZhaWxlZExvYWQoKmxvYWRlci52YWx1ZS0+cmVzb3Vy Y2VMb2FkZXIoKSk7CiAKQEAgLTMzNyw2ICszMzksNyBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5 Ojpsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5KE5ldHdvcmtpbmdDb250ZXh0KiBjb250ZXh0LCB1 bgogICAgIEhhbmdEZXRlY3Rpb25EaXNhYmxlciBoYW5nRGV0ZWN0aW9uRGlzYWJsZXI7CiAKICAg ICBpZiAoIVdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLm5ldHdvcmtDb25uZWN0aW9uKCkuY29ubmVj dGlvbigpLnNlbmRTeW5jKE1lc3NhZ2VzOjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6 UGVyZm9ybVN5bmNocm9ub3VzTG9hZChsb2FkUGFyYW1ldGVycyksIE1lc3NhZ2VzOjpOZXR3b3Jr Q29ubmVjdGlvblRvV2ViUHJvY2Vzczo6UGVyZm9ybVN5bmNocm9ub3VzTG9hZDo6UmVwbHkoZXJy b3IsIHJlc3BvbnNlLCBkYXRhKSwgMCkpIHsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1JfSUZf QUxMT1dFRChsb2FkUGFyYW1ldGVycy5zZXNzaW9uSUQsICJsb2FkUmVzb3VyY2VTeW5jaHJvbm91 c2x5OiBmYWlsZWQgc2VuZGluZyBzeW5jaHJvbm91cyBuZXR3b3JrIHByb2Nlc3MgbWVzc2FnZSAo cGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9 ICUiIFBSSXU2NCAiKSIsIGxvYWRQYXJhbWV0ZXJzLndlYlBhZ2VJRCwgbG9hZFBhcmFtZXRlcnMu d2ViRnJhbWVJRCwgbG9hZFBhcmFtZXRlcnMuaWRlbnRpZmllcik7CiAgICAgICAgIHJlc3BvbnNl ID0gUmVzb3VyY2VSZXNwb25zZSgpOwogICAgICAgICBlcnJvciA9IGludGVybmFsRXJyb3IocmVx dWVzdC51cmwoKSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggYWU3YTEwZGYxZTQyMzMxMThi MDcyZjBiYWRhNmIyNzNjYWFjZWEyOC4uMjk4NzliNDQ5NzQ4M2IyNmIwM2MzM2UxOWY1NzFmNmE2 MWY3OWMyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dl YlJlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdv cmsvV2ViUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0xOTksNiArMTk5LDcgQEAgdm9pZCBXZWJSZXNv dXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc291cmNlKGNvbnN0IFNoYXJlYWJsZVJlc291cmNlOjpI YW5kbGUmIGhhbmQKIAogICAgIGlmICghYnVmZmVyKSB7CiAgICAgICAgIExPR19FUlJPUigiVW5h YmxlIHRvIGNyZWF0ZSBidWZmZXIgZnJvbSBTaGFyZWFibGVSZXNvdXJjZSBzZW50IGZyb20gdGhl IG5ldHdvcmsgcHJvY2Vzcy4iKTsKKyAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiZGlk UmVjZWl2ZVJlc291cmNlOiBVbmFibGUgdG8gY3JlYXRlIFNoYXJlZEJ1ZmZlciAocGFnZUlEID0g JSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2 NCAiKSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRCwgbV90cmFja2luZ1BhcmFtZXRlcnMu ZnJhbWVJRCwgbV90cmFja2luZ1BhcmFtZXRlcnMucmVzb3VyY2VJRCk7CiAgICAgICAgIG1fY29y ZUxvYWRlci0+ZGlkRmFpbChpbnRlcm5hbEVycm9yKG1fY29yZUxvYWRlci0+cmVxdWVzdCgpLnVy bCgpKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9Cg== 290533 2016-10-03 16:10:55 -0700 2016-10-03 17:35:08 -0700 Patch bug-162754-20161003160746.patch text/plain 9725 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2NzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzE4MTA1NTgzY2QyMDJi NjhmMGU5NjNjYzQ3NGE4YTgxY2U5N2M0Ny4uZmE0Yzc5YzM1N2I0MWJmYjg2YWZlZTQ2MjgzNjVi NTY0MWU4M2UzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE2LTEwLTAzICBLZWl0 aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAgICAgICBNb3JlIGxvZ2dpbmcgdG8g ZGlhZ25vc2UgIldlYktpdCBlbmNvdW50ZXJlZCBhbiBpbnRlcm5hbCBlcnJvciIgbWVzc2FnZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2Mjc1NAor CisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIEFkZCBtb3Jl IGxvZ2dpbmcgYXJvdW5kIGNhbGxzIHRvIGludGVybmFsRXJyb3IsIGFzIHdlbGwgYXMgc29tZQor ICAgICAgICBsb3ctbGV2ZWwgbG9nZ2luZyBhcm91bmQgU2hhcmVkTWVtb3J5LCBhbmQgbWFjaF92 bV9tYXAgaW4gcGFydGljdWxhci4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtS ZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRl cjo6c3RhcnROZXR3b3JrTG9hZCk6CisgICAgICAgICogUGxhdGZvcm0vTG9nZ2luZy5oOgorICAg ICAgICAqIFBsYXRmb3JtL21hYy9TaGFyZWRNZW1vcnlNYWMuY3BwOgorICAgICAgICAoV2ViS2l0 OjpTaGFyZWRNZW1vcnk6OmFsbG9jYXRlKToKKyAgICAgICAgKFdlYktpdDo6bWFrZU1lbW9yeUVu dHJ5KToKKyAgICAgICAgKFdlYktpdDo6U2hhcmVkTWVtb3J5OjptYXApOgorICAgICAgICAoV2Vi S2l0OjpTaGFyZWRNZW1vcnk6On5TaGFyZWRNZW1vcnkpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv TmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRl clN0cmF0ZWd5OjpuZXR3b3JrUHJvY2Vzc0NyYXNoZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJM b2FkZXJTdHJhdGVneTo6bG9hZFJlc291cmNlU3luY2hyb25vdXNseSk6CisgICAgICAgICogV2Vi UHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNvdXJjZSk6CisKIDIwMTYtMTAtMDMgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtTT1VQ XSBDbGVhbnVwIHBlcnNpc3RlbnQgY3JlZGVudGlhbCBzdG9yYWdlIGNvZGUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3Bw CmluZGV4IDBhNzEyNjNlNTdjMjM5N2RlZTg2ZWE1YTY3ZWYwNjIyYjQxYWQ3NDkuLmFkMjgwYTNk MDM4ZTZiNjM0OWM3YWU5MmU1N2E4MDEyZDZmN2Y3NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcApAQCAtNTAs NiArNTAsNyBAQAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKICNkZWZpbmUgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRChmbXQsIC4uLikgUkVMRUFTRV9MT0dfSUYoaXNBbHdheXNPbkxvZ2dpbmdB bGxvd2VkKCksIE5ldHdvcmssICIlcCAtIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6IiBmbXQsIHRo aXMsICMjX19WQV9BUkdTX18pCisjZGVmaW5lIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQo Zm10LCAuLi4pIFJFTEVBU0VfTE9HX0VSUk9SX0lGKGlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgp LCBOZXR3b3JrLCAiJXAgLSBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OiIgZm10LCB0aGlzLCAjI19f VkFfQVJHU19fKQogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtMjE4LDcgKzIxOSw3IEBAIHZv aWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpzdGFydE5ldHdvcmtMb2FkKGNvbnN0IFJlc291cmNl UmVxdWVzdCYgcmVxdWVzdCkKICAgICBhdXRvKiBuZXR3b3JrU2Vzc2lvbiA9IFNlc3Npb25UcmFj a2VyOjpuZXR3b3JrU2Vzc2lvbihwYXJhbWV0ZXJzLnNlc3Npb25JRCk7CiAgICAgaWYgKCFuZXR3 b3JrU2Vzc2lvbikgewogICAgICAgICBXVEZMb2dBbHdheXMoIkF0dGVtcHRlZCB0byBjcmVhdGUg YSBOZXR3b3JrTG9hZCB3aXRoIGEgc2Vzc2lvbiAoaWQ9JSIgUFJJdTY0ICIpIHRoYXQgZG9lcyBu b3QgZXhpc3QuIiwgcGFyYW1ldGVycy5zZXNzaW9uSUQuc2Vzc2lvbklEKCkpOwotICAgICAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKCJzdGFydE5ldHdvcmtMb2FkOiBBdHRlbXB0ZWQgdG8gY3Jl YXRlIGEgTmV0d29ya0xvYWQgd2l0aCBhIHNlc3Npb24gdGhhdCBkb2VzIG5vdCBleGlzdCAocGFn ZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUi IFBSSXU2NCAiLCBzZXNzaW9uSUQ9JSIgUFJJdTY0ICIpIiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJ RCwgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCBwYXJh bWV0ZXJzLnNlc3Npb25JRC5zZXNzaW9uSUQoKSk7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9S X0lGX0FMTE9XRUQoInN0YXJ0TmV0d29ya0xvYWQ6IEF0dGVtcHRlZCB0byBjcmVhdGUgYSBOZXR3 b3JrTG9hZCB3aXRoIGEgc2Vzc2lvbiB0aGF0IGRvZXMgbm90IGV4aXN0IChwYWdlSUQgPSAlIiBQ Ukl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIs IHNlc3Npb25JRD0lIiBQUkl1NjQgIikiLCBtX3BhcmFtZXRlcnMud2ViUGFnZUlELCBtX3BhcmFt ZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIsIHBhcmFtZXRlcnMuc2Vz c2lvbklELnNlc3Npb25JRCgpKTsKICAgICAgICAgZGlkRmFpbExvYWRpbmcoaW50ZXJuYWxFcnJv cihyZXF1ZXN0LnVybCgpKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Mb2dnaW5nLmggYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9y bS9Mb2dnaW5nLmgKaW5kZXggYjJjMTFhMmFiYzIwYzhiNDQ4OTFjOWZmNGJiNzJkZTU2OTA1NGM0 OS4uODcyMDI3MmRkMjZiNDllNTYzZWRjYWQwNjNkYWE0ZjI2ZWViNGNhYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvUGxhdGZvcm0vTG9nZ2luZy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1Bs YXRmb3JtL0xvZ2dpbmcuaApAQCAtNjcsNiArNjcsNyBAQCBleHRlcm4gIkMiIHsKICAgICBNKFN0 b3JhZ2VBUEkpIFwKICAgICBNKFRleHRJbnB1dCkgXAogICAgIE0oVmlld0dlc3R1cmVzKSBcCisg ICAgTShWaXJ0dWFsTWVtb3J5KSBcCiAgICAgTShWaXNpYmxlUmVjdHMpIFwKIAogV0VCS0lUMl9M T0dfQ0hBTk5FTFMoREVDTEFSRV9MT0dfQ0hBTk5FTCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1BsYXRmb3JtL21hYy9TaGFyZWRNZW1vcnlNYWMuY3BwIGIvU291cmNlL1dlYktpdDIvUGxh dGZvcm0vbWFjL1NoYXJlZE1lbW9yeU1hYy5jcHAKaW5kZXggNTQ0ZmI5OTUyMzJhNTIwNzA2YjQw ZWE1MzQ1NzM5MmI3NjM3ZjNhZi4uNWUyMjE2N2ViMmIzMDk2MzhhMmEzZThhMzA3MWZjMzY4NTJl ODY4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vbWFjL1NoYXJlZE1lbW9y eU1hYy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vbWFjL1NoYXJlZE1lbW9yeU1h Yy5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2luY2x1ZGUgIkRlY29kZXIuaCIKICNpbmNsdWRl ICJFbmNvZGVyLmgiCisjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIk1hY2hQb3J0Lmgi CiAjaW5jbHVkZSA8V2ViQ29yZS9NYWNoU2VuZFJpZ2h0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9N YWNoVk1TUEkuaD4KQEAgLTEwNSw3ICsxMDYsMTEgQEAgUmVmUHRyPFNoYXJlZE1lbW9yeT4gU2hh cmVkTWVtb3J5OjphbGxvY2F0ZShzaXplX3Qgc2l6ZSkKICAgICBtYWNoX3ZtX2FkZHJlc3NfdCBh ZGRyZXNzOwogICAgIGtlcm5fcmV0dXJuX3Qga3IgPSBtYWNoX3ZtX2FsbG9jYXRlKG1hY2hfdGFz a19zZWxmKCksICZhZGRyZXNzLCByb3VuZF9wYWdlKHNpemUpLCBWTV9GTEFHU19BTllXSEVSRSk7 CiAgICAgaWYgKGtyICE9IEtFUk5fU1VDQ0VTUykgeworI2lmIFJFTEVBU0VfTE9HX0RJU0FCTEVE CiAgICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIGFsbG9jYXRlIG1hY2hfdm1fYWxsb2NhdGUg c2hhcmVkIG1lbW9yeSAoJXp1IGJ5dGVzKS4gJXMgKCV4KSIsIHNpemUsIG1hY2hfZXJyb3Jfc3Ry aW5nKGtyKSwga3IpOworI2Vsc2UKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoVmlydHVhbE1l bW9yeSwgIiVwIC0gU2hhcmVkTWVtb3J5OjphbGxvY2F0ZTogRmFpbGVkIHRvIGFsbG9jYXRlIG1h Y2hfdm1fYWxsb2NhdGUgc2hhcmVkIG1lbW9yeSAoJXp1IGJ5dGVzKS4gJXtwdWJsaWN9cyAoJXgp IiwgbnVsbHB0ciwgc2l6ZSwgbWFjaF9lcnJvcl9zdHJpbmcoa3IpLCBrcik7CisjZW5kaWYKICAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCkBAIC0xMzgsNyArMTQzLDExIEBAIHN0YXRp YyBXZWJDb3JlOjpNYWNoU2VuZFJpZ2h0IG1ha2VNZW1vcnlFbnRyeShzaXplX3Qgc2l6ZSwgdm1f b2Zmc2V0X3Qgb2Zmc2V0LCBTCiAgICAgbWFjaF9wb3J0X3QgcG9ydDsKICAgICBrZXJuX3JldHVy bl90IGtyID0gbWFjaF9tYWtlX21lbW9yeV9lbnRyeV82NChtYWNoX3Rhc2tfc2VsZigpLCAmbWVt b3J5T2JqZWN0U2l6ZSwgb2Zmc2V0LCBtYWNoUHJvdGVjdGlvbihwcm90ZWN0aW9uKSB8IFZNX1BS T1RfSVNfTUFTSyB8IE1BUF9NRU1fVk1fU0hBUkUsICZwb3J0LCBwYXJlbnRFbnRyeSk7CiAgICAg aWYgKGtyICE9IEtFUk5fU1VDQ0VTUykgeworI2lmIFJFTEVBU0VfTE9HX0RJU0FCTEVECiAgICAg ICAgIExPR19FUlJPUigiRmFpbGVkIHRvIGNyZWF0ZSBhIG1hY2ggcG9ydCBmb3Igc2hhcmVkIG1l bW9yeS4gJXMgKCV4KSIsIG1hY2hfZXJyb3Jfc3RyaW5nKGtyKSwga3IpOworI2Vsc2UKKyAgICAg ICAgUkVMRUFTRV9MT0dfRVJST1IoVmlydHVhbE1lbW9yeSwgIiVwIC0gU2hhcmVkTWVtb3J5Ojpt YWtlTWVtb3J5RW50cnk6IEZhaWxlZCB0byBjcmVhdGUgYSBtYWNoIHBvcnQgZm9yIHNoYXJlZCBt ZW1vcnkuICV7cHVibGljfXMgKCV4KSIsIG51bGxwdHIsIG1hY2hfZXJyb3Jfc3RyaW5nKGtyKSwg a3IpOworI2VuZGlmCiAgICAgICAgIHJldHVybiB7IH07CiAgICAgfQogCkBAIC0xNzQsOCArMTgz LDE1IEBAIFJlZlB0cjxTaGFyZWRNZW1vcnk+IFNoYXJlZE1lbW9yeTo6bWFwKGNvbnN0IEhhbmRs ZSYgaGFuZGxlLCBQcm90ZWN0aW9uIHByb3RlY3RpCiAgICAgdm1fcHJvdF90IHZtUHJvdGVjdGlv biA9IG1hY2hQcm90ZWN0aW9uKHByb3RlY3Rpb24pOwogICAgIG1hY2hfdm1fYWRkcmVzc190IG1h cHBlZEFkZHJlc3MgPSAwOwogICAgIGtlcm5fcmV0dXJuX3Qga3IgPSBtYWNoX3ZtX21hcChtYWNo X3Rhc2tfc2VsZigpLCAmbWFwcGVkQWRkcmVzcywgcm91bmRfcGFnZShoYW5kbGUubV9zaXplKSwg MCwgVk1fRkxBR1NfQU5ZV0hFUkUsIGhhbmRsZS5tX3BvcnQsIDAsIGZhbHNlLCB2bVByb3RlY3Rp b24sIHZtUHJvdGVjdGlvbiwgVk1fSU5IRVJJVF9OT05FKTsKKyNpZiBSRUxFQVNFX0xPR19ESVNB QkxFRAogICAgIGlmIChrciAhPSBLRVJOX1NVQ0NFU1MpCiAgICAgICAgIHJldHVybiBudWxscHRy OworI2Vsc2UKKyAgICBpZiAoa3IgIT0gS0VSTl9TVUNDRVNTKSB7CisgICAgICAgIFJFTEVBU0Vf TE9HX0VSUk9SKFZpcnR1YWxNZW1vcnksICIlcCAtIFNoYXJlZE1lbW9yeTo6bWFwOiBGYWlsZWQg dG8gbWFwIHNoYXJlZCBtZW1vcnkuICV7cHVibGljfXMgKCV4KSIsIG51bGxwdHIsIG1hY2hfZXJy b3Jfc3RyaW5nKGtyKSwga3IpOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CisjZW5k aWYKIAogICAgIGF1dG8gc2hhcmVkTWVtb3J5KGFkb3B0UmVmKCpuZXcgU2hhcmVkTWVtb3J5KSk7 CiAgICAgc2hhcmVkTWVtb3J5LT5tX3NpemUgPSBoYW5kbGUubV9zaXplOwpAQCAtMTkwLDEyICsy MDYsMjYgQEAgU2hhcmVkTWVtb3J5Ojp+U2hhcmVkTWVtb3J5KCkKIHsKICAgICBpZiAobV9kYXRh KSB7CiAgICAgICAgIGtlcm5fcmV0dXJuX3Qga3IgPSBtYWNoX3ZtX2RlYWxsb2NhdGUobWFjaF90 YXNrX3NlbGYoKSwgdG9WTUFkZHJlc3MobV9kYXRhKSwgcm91bmRfcGFnZShtX3NpemUpKTsKKyNp ZiBSRUxFQVNFX0xPR19ESVNBQkxFRAogICAgICAgICBBU1NFUlRfVU5VU0VEKGtyLCBrciA9PSBL RVJOX1NVQ0NFU1MpOworI2Vsc2UKKyAgICAgICAgaWYgKGtyICE9IEtFUk5fU1VDQ0VTUykgewor ICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoVmlydHVhbE1lbW9yeSwgIiVwIC0gU2hhcmVk TWVtb3J5Ojp+U2hhcmVkTWVtb3J5OiBGYWlsZWQgdG8gZGVhbGxvY2F0ZSBzaGFyZWQgbWVtb3J5 LiAle3B1YmxpY31zICgleCkiLCB0aGlzLCBtYWNoX2Vycm9yX3N0cmluZyhrciksIGtyKTsKKyAg ICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICB9CisjZW5kaWYKICAgICB9 CiAKICAgICBpZiAobV9wb3J0KSB7CiAgICAgICAgIGtlcm5fcmV0dXJuX3Qga3IgPSBtYWNoX3Bv cnRfZGVhbGxvY2F0ZShtYWNoX3Rhc2tfc2VsZigpLCBtX3BvcnQpOworI2lmIFJFTEVBU0VfTE9H X0RJU0FCTEVECiAgICAgICAgIEFTU0VSVF9VTlVTRUQoa3IsIGtyID09IEtFUk5fU1VDQ0VTUyk7 CisjZWxzZQorICAgICAgICBpZiAoa3IgIT0gS0VSTl9TVUNDRVNTKSB7CisgICAgICAgICAgICBS RUxFQVNFX0xPR19FUlJPUihWaXJ0dWFsTWVtb3J5LCAiJXAgLSBTaGFyZWRNZW1vcnk6On5TaGFy ZWRNZW1vcnk6IEZhaWxlZCB0byBkZWFsbG9jYXRlIHBvcnQuICV7cHVibGljfXMgKCV4KSIsIHRo aXMsIG1hY2hfZXJyb3Jfc3RyaW5nKGtyKSwga3IpOworICAgICAgICAgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7CisgICAgICAgIH0KKyNlbmRpZgogICAgIH0gICAgICAgIAogfQogICAgIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0 ZWd5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJh dGVneS5jcHAKaW5kZXggYTlhODQzZGUxMmIyYmQ5OTU4NTQwMzhmNzg2MWU4MzhiMWE1YTNlZS4u YTNlNGI5OTY1ZjY1Nzk0ZTAzYzhhMjY1ZDY0ZWVmODc5ZmM5NzgwNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3Bw CkBAIC0zMDUsNiArMzA1LDggQEAgdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6cmVzdW1lUGVuZGlu Z1JlcXVlc3RzKCkKIAogdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6bmV0d29ya1Byb2Nlc3NDcmFz aGVkKCkKIHsKKyAgICBSRUxFQVNFX0xPR19FUlJPUihOZXR3b3JrLCAiV2ViTG9hZGVyU3RyYXRl Z3k6Om5ldHdvcmtQcm9jZXNzQ3Jhc2hlZDogZmFpbGluZyBhbGwgcGVuZGluZyByZXNvdXJjZSBs b2FkZXJzIik7CisKICAgICBmb3IgKGF1dG8mIGxvYWRlciA6IG1fd2ViUmVzb3VyY2VMb2FkZXJz KQogICAgICAgICBzY2hlZHVsZUludGVybmFsbHlGYWlsZWRMb2FkKCpsb2FkZXIudmFsdWUtPnJl c291cmNlTG9hZGVyKCkpOwogCkBAIC0zMzcsNiArMzM5LDcgQEAgdm9pZCBXZWJMb2FkZXJTdHJh dGVneTo6bG9hZFJlc291cmNlU3luY2hyb25vdXNseShOZXR3b3JraW5nQ29udGV4dCogY29udGV4 dCwgdW4KICAgICBIYW5nRGV0ZWN0aW9uRGlzYWJsZXIgaGFuZ0RldGVjdGlvbkRpc2FibGVyOwog CiAgICAgaWYgKCFXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5uZXR3b3JrQ29ubmVjdGlvbigpLmNv bm5lY3Rpb24oKS5zZW5kU3luYyhNZXNzYWdlczo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3M6OlBlcmZvcm1TeW5jaHJvbm91c0xvYWQobG9hZFBhcmFtZXRlcnMpLCBNZXNzYWdlczo6TmV0 d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OlBlcmZvcm1TeW5jaHJvbm91c0xvYWQ6OlJlcGx5 KGVycm9yLCByZXNwb25zZSwgZGF0YSksIDApKSB7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9S X0lGX0FMTE9XRUQobG9hZFBhcmFtZXRlcnMuc2Vzc2lvbklELCAibG9hZFJlc291cmNlU3luY2hy b25vdXNseTogZmFpbGVkIHNlbmRpbmcgc3luY2hyb25vdXMgbmV0d29yayBwcm9jZXNzIG1lc3Nh Z2UgKHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNl SUQgPSAlIiBQUkl1NjQgIikiLCBsb2FkUGFyYW1ldGVycy53ZWJQYWdlSUQsIGxvYWRQYXJhbWV0 ZXJzLndlYkZyYW1lSUQsIGxvYWRQYXJhbWV0ZXJzLmlkZW50aWZpZXIpOwogICAgICAgICByZXNw b25zZSA9IFJlc291cmNlUmVzcG9uc2UoKTsKICAgICAgICAgZXJyb3IgPSBpbnRlcm5hbEVycm9y KHJlcXVlc3QudXJsKCkpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IGFlN2ExMGRmMWU0MjMz MTE4YjA3MmYwYmFkYTZiMjczY2FhY2VhMjguLjI5ODc5YjQ0OTc0ODNiMjZiMDNjMzNlMTlmNTcx ZjZhNjFmNzljMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29y ay9XZWJSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9O ZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmNwcApAQCAtMTk5LDYgKzE5OSw3IEBAIHZvaWQgV2Vi UmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNvdXJjZShjb25zdCBTaGFyZWFibGVSZXNvdXJj ZTo6SGFuZGxlJiBoYW5kCiAKICAgICBpZiAoIWJ1ZmZlcikgewogICAgICAgICBMT0dfRVJST1Io IlVuYWJsZSB0byBjcmVhdGUgYnVmZmVyIGZyb20gU2hhcmVhYmxlUmVzb3VyY2Ugc2VudCBmcm9t IHRoZSBuZXR3b3JrIHByb2Nlc3MuIik7CisgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQo ImRpZFJlY2VpdmVSZXNvdXJjZTogVW5hYmxlIHRvIGNyZWF0ZSBTaGFyZWRCdWZmZXIgKHBhZ2VJ RCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQ Ukl1NjQgIikiLCBtX3RyYWNraW5nUGFyYW1ldGVycy5wYWdlSUQsIG1fdHJhY2tpbmdQYXJhbWV0 ZXJzLmZyYW1lSUQsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnJlc291cmNlSUQpOwogICAgICAgICBt X2NvcmVMb2FkZXItPmRpZEZhaWwoaW50ZXJuYWxFcnJvcihtX2NvcmVMb2FkZXItPnJlcXVlc3Qo KS51cmwoKSkpOwogICAgICAgICByZXR1cm47CiAgICAgfQo=