145948 2015-06-12 16:20:07 -0700 [WK2] API::Navigation objects are leaked on history navigation to HistoryItems in PageCache 2015-06-15 09:53:31 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=145977 P2 Normal --- 1 cdumez cdumez andersca barraclough commit-queue japhet kling sam oldest_to_newest 1101736 0 cdumez 2015-06-12 16:20:07 -0700 API::Navigation objects are leaked on history navigation to HistoryItems in PageCache. When WebPageProxy::goBack() is called: 1. We create a back/forward navigation item by calling m_navigationState->createBackForwardNavigation() 2. We send WebPage::GoBack IPC to the WebContent process with the navigationID that was just created 3. WebPage::goBack() does NOT update m_pendingNavigationID because item->isInPageCache() return true. As a result, the navigationID is ignored. 4. In FrameLoader::loadDifferentDocumentItem(), we get a CachedPage from the PageCache and we reuse the cached DocumentLoader (instead of creating a new one) 5. WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction() is called later on. It sends WebPageProxy::DecidePolicyForNavigationAction IPC to the UIProcess with a navigationID that is 0 (instead of the actual navigationID of the BackForward Navigation object) 6. WebPageProxy::decidePolicyForNavigationAction() is called and since navigationID is 0, it constructors a new Navigation object by calling m_navigationState->createLoadRequestNavigation(). Later on, when navigating away, the LoadRequestNavigation object will be destroyed. However, the BackForwardNavigation object will be leaked. -- Related to <rdar://problem/21305706> but likely a different reason for leaking. 1101737 1 254833 cdumez 2015-06-12 16:37:57 -0700 Created attachment 254833 WIP Patch Upload WIP patch in case Sam / Anders have early feedback. It does fix the leak but I do not know much about those Navigation objects. 1101790 2 254849 cdumez 2015-06-12 20:47:59 -0700 Created attachment 254849 Patch 1101844 3 254849 commit-queue 2015-06-13 21:53:52 -0700 Comment on attachment 254849 Patch Clearing flags on attachment: 254849 Committed r185542: <http://trac.webkit.org/changeset/185542> 1101845 4 commit-queue 2015-06-13 21:53:58 -0700 All reviewed patches have been landed. Closing bug. 254833 2015-06-12 16:37:57 -0700 2015-06-12 20:47:55 -0700 WIP Patch 145948_wip_patch.patch text/plain 7157 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuaCBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuaAppbmRleCBkZGVlNGE2Li42MDQ4ZmZiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oCkBAIC0zNDcsNiArMzQ3LDcgQEAgcHVi bGljOgogICAgIHZpcnR1YWwgdm9pZCBwcmVwYXJlRm9yRGF0YVNvdXJjZVJlcGxhY2VtZW50KCkg b3ZlcnJpZGUgeyB9CiAKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8RG9jdW1lbnRMb2FkZXI+IGNy ZWF0ZURvY3VtZW50TG9hZGVyKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFN1YnN0aXR1 dGVEYXRhJikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUNhY2hlZERvY3VtZW50 TG9hZGVyKERvY3VtZW50TG9hZGVyJikgb3ZlcnJpZGUgeyB9CiAgICAgdmlydHVhbCB2b2lkIHNl dFRpdGxlKGNvbnN0IFN0cmluZ1dpdGhEaXJlY3Rpb24mLCBjb25zdCBVUkwmKSBvdmVycmlkZSB7 IH0KIAogICAgIHZpcnR1YWwgU3RyaW5nIHVzZXJBZ2VudChjb25zdCBVUkwmKSBvdmVycmlkZSB7 IHJldHVybiAiIjsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggNjI4 ZTY3ZC4uMmVmOTUwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0z MTc3LDYgKzMxNzcsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkRGlmZmVyZW50RG9jdW1lbnRJ dGVtKEhpc3RvcnlJdGVtJiBpdGVtLCBGcmFtZUxvYWRUeXBlIGxvYQogCiAgICAgaWYgKENhY2hl ZFBhZ2UqIGNhY2hlZFBhZ2UgPSBQYWdlQ2FjaGU6OnNpbmdsZXRvbigpLmdldChpdGVtLCBtX2Zy YW1lLnBhZ2UoKSkpIHsKICAgICAgICAgYXV0byBkb2N1bWVudExvYWRlciA9IGNhY2hlZFBhZ2Ut PmRvY3VtZW50TG9hZGVyKCk7CisgICAgICAgIG1fY2xpZW50LnVwZGF0ZUNhY2hlZERvY3VtZW50 TG9hZGVyKCpkb2N1bWVudExvYWRlcik7CiAgICAgICAgIGRvY3VtZW50TG9hZGVyLT5zZXRUcmln Z2VyaW5nQWN0aW9uKE5hdmlnYXRpb25BY3Rpb24oZG9jdW1lbnRMb2FkZXItPnJlcXVlc3QoKSwg bG9hZFR5cGUsIGZhbHNlKSk7CiAgICAgICAgIGRvY3VtZW50TG9hZGVyLT5zZXRMYXN0Q2hlY2tl ZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0KCkpOwogICAgICAgICBsb2FkV2l0aERvY3VtZW50TG9h ZGVyKGRvY3VtZW50TG9hZGVyLCBsb2FkVHlwZSwgMCwgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlk VVJMOjpZZXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy Q2xpZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAppbmRl eCBhZmFiYTZhLi5jMTNhMTk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJD bGllbnQuaApAQCAtMjUxLDYgKzI1MSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAg dmlydHVhbCB2b2lkIHByZXBhcmVGb3JEYXRhU291cmNlUmVwbGFjZW1lbnQoKSA9IDA7CiAKICAg ICAgICAgdmlydHVhbCBQYXNzUmVmUHRyPERvY3VtZW50TG9hZGVyPiBjcmVhdGVEb2N1bWVudExv YWRlcihjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBTdWJzdGl0dXRlRGF0YSYpID0gMDsK KyAgICAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUNhY2hlZERvY3VtZW50TG9hZGVyKERvY3VtZW50 TG9hZGVyJikgPSAwOwogICAgICAgICB2aXJ0dWFsIHZvaWQgc2V0VGl0bGUoY29uc3QgU3RyaW5n V2l0aERpcmVjdGlvbiYsIGNvbnN0IFVSTCYpID0gMDsKIAogICAgICAgICB2aXJ0dWFsIFN0cmlu ZyB1c2VyQWdlbnQoY29uc3QgVVJMJikgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9t YWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQv bWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggZjZmOTRhMi4u N2NmMTU4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2Vi RnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9y dC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCkBAIC0xOTMsNiArMTkzLDcgQEAgcHJpdmF0ZToKICAg ICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNoTG9hZCgpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9p ZCBwcmVwYXJlRm9yRGF0YVNvdXJjZVJlcGxhY2VtZW50KCkgb3ZlcnJpZGU7CiAgICAgdmlydHVh bCBQYXNzUmVmUHRyPFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyPiBjcmVhdGVEb2N1bWVudExvYWRl cihjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBXZWJDb3JlOjpTdWJzdGl0 dXRlRGF0YSYpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVDYWNoZWREb2N1bWVu dExvYWRlcihXZWJDb3JlOjpEb2N1bWVudExvYWRlciYpIG92ZXJyaWRlIHsgfQogCiAgICAgdmly dHVhbCB2b2lkIHNldFRpdGxlKGNvbnN0IFdlYkNvcmU6OlN0cmluZ1dpdGhEaXJlY3Rpb24mLCBj b25zdCBXZWJDb3JlOjpVUkwmKSBvdmVycmlkZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp ZW50LmNwcAppbmRleCA2MWIxNGVjLi44MjliNzM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVy Q2xpZW50LmNwcApAQCAtMTI0Niw2ICsxMjQ2LDExIEBAIFBhc3NSZWZQdHI8RG9jdW1lbnRMb2Fk ZXI+IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpjcmVhdGVEb2N1bWVudExvYWRlcihjb25zdCBSZXNv CiAgICAgcmV0dXJuIG1fZnJhbWUtPnBhZ2UoKS0+Y3JlYXRlRG9jdW1lbnRMb2FkZXIoKm1fZnJh bWUtPmNvcmVGcmFtZSgpLCByZXF1ZXN0LCBzdWJzdGl0dXRlRGF0YSk7CiB9CiAKK3ZvaWQgV2Vi RnJhbWVMb2FkZXJDbGllbnQ6OnVwZGF0ZUNhY2hlZERvY3VtZW50TG9hZGVyKFdlYkNvcmU6OkRv Y3VtZW50TG9hZGVyJiBsb2FkZXIpCit7CisgICAgbV9mcmFtZS0+cGFnZSgpLT51cGRhdGVDYWNo ZWREb2N1bWVudExvYWRlcihzdGF0aWNfY2FzdDxXZWJEb2N1bWVudExvYWRlciY+KGxvYWRlciks ICptX2ZyYW1lLT5jb3JlRnJhbWUoKSk7Cit9CisKIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6 OnNldFRpdGxlKGNvbnN0IFN0cmluZ1dpdGhEaXJlY3Rpb24mIHRpdGxlLCBjb25zdCBVUkwmIHVy bCkKIHsKICAgICBXZWJQYWdlKiB3ZWJQYWdlID0gbV9mcmFtZS0+cGFnZSgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRl ckNsaWVudC5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJG cmFtZUxvYWRlckNsaWVudC5oCmluZGV4IDQ2NjVlODQuLjNjYjE1ZTkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll bnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50LmgKQEAgLTE2NCw2ICsxNjQsOCBAQCBwcml2YXRlOgogICAgIHZpcnR1 YWwgdm9pZCBwcmVwYXJlRm9yRGF0YVNvdXJjZVJlcGxhY2VtZW50KCkgb3ZlcnJpZGU7CiAgICAg CiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyPiBjcmVhdGVE b2N1bWVudExvYWRlcihjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBXZWJD b3JlOjpTdWJzdGl0dXRlRGF0YSYpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVD YWNoZWREb2N1bWVudExvYWRlcihXZWJDb3JlOjpEb2N1bWVudExvYWRlciYpIG92ZXJyaWRlOwor CiAgICAgdmlydHVhbCB2b2lkIHNldFRpdGxlKGNvbnN0IFdlYkNvcmU6OlN0cmluZ1dpdGhEaXJl Y3Rpb24mLCBjb25zdCBXZWJDb3JlOjpVUkwmKSBvdmVycmlkZTsKICAgICAKICAgICB2aXJ0dWFs IFN0cmluZyB1c2VyQWdlbnQoY29uc3QgV2ViQ29yZTo6VVJMJikgb3ZlcnJpZGU7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMDA2YTkxZS4u MzU4ZTFjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcApAQCAtMTE2MSw4ICsxMTYxLDcgQEAgdm9pZCBXZWJQYWdlOjpnb0ZvcndhcmQodWludDY0 X3QgbmF2aWdhdGlvbklELCB1aW50NjRfdCBiYWNrRm9yd2FyZEl0ZW1JRCkKICAgICAgICAgcmV0 dXJuOwogCiAgICAgQVNTRVJUKCFtX3BlbmRpbmdOYXZpZ2F0aW9uSUQpOwotICAgIGlmICghaXRl bS0+aXNJblBhZ2VDYWNoZSgpKQotICAgICAgICBtX3BlbmRpbmdOYXZpZ2F0aW9uSUQgPSBuYXZp Z2F0aW9uSUQ7CisgICAgbV9wZW5kaW5nTmF2aWdhdGlvbklEID0gbmF2aWdhdGlvbklEOwogCiAg ICAgbV9wYWdlLT5nb1RvSXRlbSgqaXRlbSwgRnJhbWVMb2FkVHlwZTo6Rm9yd2FyZCk7CiB9CkBA IC0xMTc3LDggKzExNzYsNyBAQCB2b2lkIFdlYlBhZ2U6OmdvQmFjayh1aW50NjRfdCBuYXZpZ2F0 aW9uSUQsIHVpbnQ2NF90IGJhY2tGb3J3YXJkSXRlbUlEKQogICAgICAgICByZXR1cm47CiAKICAg ICBBU1NFUlQoIW1fcGVuZGluZ05hdmlnYXRpb25JRCk7Ci0gICAgaWYgKCFpdGVtLT5pc0luUGFn ZUNhY2hlKCkpCi0gICAgICAgIG1fcGVuZGluZ05hdmlnYXRpb25JRCA9IG5hdmlnYXRpb25JRDsK KyAgICBtX3BlbmRpbmdOYXZpZ2F0aW9uSUQgPSBuYXZpZ2F0aW9uSUQ7CiAKICAgICBtX3BhZ2Ut PmdvVG9JdGVtKCppdGVtLCBGcmFtZUxvYWRUeXBlOjpCYWNrKTsKIH0KQEAgLTExOTMsOCArMTE5 MSw3IEBAIHZvaWQgV2ViUGFnZTo6Z29Ub0JhY2tGb3J3YXJkSXRlbSh1aW50NjRfdCBuYXZpZ2F0 aW9uSUQsIHVpbnQ2NF90IGJhY2tGb3J3YXJkSXRlCiAgICAgICAgIHJldHVybjsKIAogICAgIEFT U0VSVCghbV9wZW5kaW5nTmF2aWdhdGlvbklEKTsKLSAgICBpZiAoIWl0ZW0tPmlzSW5QYWdlQ2Fj aGUoKSkKLSAgICAgICAgbV9wZW5kaW5nTmF2aWdhdGlvbklEID0gbmF2aWdhdGlvbklEOworICAg IG1fcGVuZGluZ05hdmlnYXRpb25JRCA9IG5hdmlnYXRpb25JRDsKIAogICAgIG1fcGFnZS0+Z29U b0l0ZW0oKml0ZW0sIEZyYW1lTG9hZFR5cGU6OkluZGV4ZWRCYWNrRm9yd2FyZCk7CiB9CkBAIC00 OTI0LDYgKzQ5MjEsMTQgQEAgUGFzc1JlZlB0cjxEb2N1bWVudExvYWRlcj4gV2ViUGFnZTo6Y3Jl YXRlRG9jdW1lbnRMb2FkZXIoRnJhbWUmIGZyYW1lLCBjb25zdCBSZXMKICAgICByZXR1cm4gZG9j dW1lbnRMb2FkZXIucmVsZWFzZSgpOwogfQogCit2b2lkIFdlYlBhZ2U6OnVwZGF0ZUNhY2hlZERv Y3VtZW50TG9hZGVyKFdlYkRvY3VtZW50TG9hZGVyJiBkb2N1bWVudExvYWRlciwgRnJhbWUmIGZy YW1lKQoreworICAgIGlmIChtX3BlbmRpbmdOYXZpZ2F0aW9uSUQgJiYgZnJhbWUuaXNNYWluRnJh bWUoKSkgeworICAgICAgICBkb2N1bWVudExvYWRlci5zZXROYXZpZ2F0aW9uSUQobV9wZW5kaW5n TmF2aWdhdGlvbklEKTsKKyAgICAgICAgbV9wZW5kaW5nTmF2aWdhdGlvbklEID0gMDsKKyAgICB9 Cit9CisKIHZvaWQgV2ViUGFnZTo6Z2V0Qnl0ZWNvZGVQcm9maWxlKHVpbnQ2NF90IGNhbGxiYWNr SUQpCiB7CiAgICAgaWYgKCFKU0RPTVdpbmRvdzo6Y29tbW9uVk0oKS5tX3BlckJ5dGVjb2RlUHJv ZmlsZXIpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmlu ZGV4IDAxODI4MWMuLmY5ZTYxMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuaApAQCAtMTUzLDYgKzE1Myw3IEBAIGNsYXNzIFZpc2libGVDb250ZW50UmVj dFVwZGF0ZUluZm87CiBjbGFzcyBXZWJDb2xvckNob29zZXI7CiBjbGFzcyBXZWJDb250ZXh0TWVu dTsKIGNsYXNzIFdlYkNvbnRleHRNZW51SXRlbURhdGE7CitjbGFzcyBXZWJEb2N1bWVudExvYWRl cjsKIGNsYXNzIFdlYkV2ZW50OwogY2xhc3MgV2ViRnJhbWU7CiBjbGFzcyBXZWJGdWxsU2NyZWVu TWFuYWdlcjsKQEAgLTg3MSw2ICs4NzIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRTY3JvbGxi YXJPdmVybGF5U3R5bGUoV1RGOjpPcHRpb25hbDx1aW50MzJfdCAvKiBXZWJDb3JlOjpTY3JvbGxi YXJPdmVybGF5U3R5bGUgKi8+IHNjcm9sbGJhclN0eWxlKTsKIAogICAgIFBhc3NSZWZQdHI8V2Vi Q29yZTo6RG9jdW1lbnRMb2FkZXI+IGNyZWF0ZURvY3VtZW50TG9hZGVyKFdlYkNvcmU6OkZyYW1l JiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6U3Vic3Rp dHV0ZURhdGEmKTsKKyAgICB2b2lkIHVwZGF0ZUNhY2hlZERvY3VtZW50TG9hZGVyKFdlYkRvY3Vt ZW50TG9hZGVyJiwgV2ViQ29yZTo6RnJhbWUmKTsKIAogICAgIHZvaWQgZ2V0Qnl0ZWNvZGVQcm9m aWxlKHVpbnQ2NF90IGNhbGxiYWNrSUQpOwogICAgIAo= 254849 2015-06-12 20:47:59 -0700 2015-06-13 21:53:52 -0700 Patch bug-145948-20150612204728.patch text/plain 14011 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmRkNmIxYWVmNDVjNjU3 MGZjZGFkYjUzZWNkYzMwOTk4Y2Y1MTc5Ni4uYTQzNDM5ZDAwYzcyZTM0YjEwYzk5OGQwYTg1MTY4 Y2Q2YjdmMDZlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE1LTA2LTEyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl0gQVBJOjpOYXZpZ2F0 aW9uIG9iamVjdHMgYXJlIGxlYWtlZCBvbiBoaXN0b3J5IG5hdmlnYXRpb24gdG8gSGlzdG9yeUl0 ZW1zIGluIFBhZ2VDYWNoZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTQ1OTQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQVBJOjpOYXZpZ2F0aW9uIG9iamVjdHMgd2VyZSBsZWFrZWQgb24gaGlzdG9yeSBu YXZpZ2F0aW9uIHRvCisgICAgICAgIEhpc3RvcnlJdGVtcyBpbiBQYWdlQ2FjaGUuIEluIHN1Y2gg Y2FzZSwgd2Ugd291bGQgY3JlYXRlIDIgTmF2aWdhdGlvbgorICAgICAgICBvYmplY3RzIGluc3Rl YWQgb2YgMSBhbmQgdGhlIGZpcnN0IG9uZSB3b3VsZCBiZSBsZWFrZWQuIFRoZSByZWFzb24KKyAg ICAgICAgd2UgY3JlYXRlIHRoZSBzZWNvbmQgb25lIGlzIGJlY2F1c2Ugd2UgZmFpbCB0byBwYXNz IGFsb25nIHRoZQorICAgICAgICBuYXZpZ2F0aW9uSUQgZnJvbSB0aGUgVUlQcm9jZXNzIHRvIHRo ZSBXZWJQcm9jZXNzIGFuZCB0aGVuIGJhY2sgdG8gdGhlCisgICAgICAgIFVJUHJvY2Vzcy4gT24g dGhlIElQQyBiYWNrIHRvIHRoZSBVSVByb2Nlc3MsIHRoZSBuYXZpZ2F0aW9uSUQgZW5kcyB1cAor ICAgICAgICBiZWluZyAwIHNvIHRoZSBVSVByb2Nlc3MgY3JlYXRlcyBhIG5ldyBOYXZpZ2F0aW9u IG9iamVjdCwgdGhpbmtpbmcgdGhhdAorICAgICAgICB0aGUgbG9hZCB3YXMgdHJpZ2dlcmVkIGJ5 IHRoZSBXZWJDb250ZW50IHByb2Nlc3MuCisKKyAgICAgICAgV2Ugbm93IHBhc3MgYWxvbmcgdGhl IG5hdmlnYXRpb25JRCwgZXZlbiBpZiB0aGUgSGlzdG9yeUl0ZW0gaXMgaW4gdGhlCisgICAgICAg IFBhZ2VDYWNoZSBhbmQgd2UgZW5kIHVwIHJldXNpbmcgdGhlIGNhY2hlZCBEb2N1bWVudExvYWRl ciwgaW5zdGVhZCBvZgorICAgICAgICBjcmVhdGluZyBhIG5ldyBvbmUuIEEgbmV3IHVwZGF0ZUNh Y2hlZERvY3VtZW50TG9hZGVyKCkgZGVsZWdhdGUgaXMKKyAgICAgICAgYWRkZWQgdG8gdGhlIEZy YW1lTG9hZGVyQ2xpZW50LCBzaW1pbGFybHkgdG8gdGhlIHByZS1leGlzdGluZworICAgICAgICBj cmVhdGVEb2N1bWVudExvYWRlcigpIGJ1dCBmb3IgdGhlIGNhc2Ugd2hlcmUgdGhlIERvY3VtZW50 TG9hZGVyIGdldHMKKyAgICAgICAgcmV1c2VkLgorCisgICAgICAgICogbG9hZGVyL0VtcHR5Q2xp ZW50cy5oOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZUxvYWRlcjo6bG9hZERpZmZlcmVudERvY3VtZW50SXRlbSk6CisgICAgICAgICog bG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50Lmg6CisKIDIwMTUtMDYtMTIgIEFuZGVycyBDYXJsc3Nv biAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBkZWxldGVFbXB0eURpcmVjdG9yeSBz aG91bGQgZGVsZXRlIC5EU19TdG9yZSBmaWxlcyBvbiBPUyBYCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXgg YzdjYzcyNGUwMjcyYjM2MGM4OGViZWI3NTI1MmFlYmZjY2QwNmUzMy4uMTcxMjEyZDJmNDMxOGE0 M2UxZDI5OTExMmNiNzcxZWVlMzI0OGVmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE1LTA2LTEyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgW1dLMl0gQVBJOjpOYXZpZ2F0aW9uIG9iamVjdHMgYXJlIGxlYWtlZCBvbiBoaXN0b3J5IG5h dmlnYXRpb24gdG8gSGlzdG9yeUl0ZW1zIGluIFBhZ2VDYWNoZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1OTQ4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGVtcHR5IGltcGxlbWVudGF0aW9uIGZv ciBuZXcKKyAgICAgICAgRnJhbWVMb2FkZXJDbGllbnQ6OnVwZGF0ZWRDYWNoZWREb2N1bWVudExv YWRlcigpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu aDoKKwogMjAxNS0wNi0xMSAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAg ICAgV2ViQ29yZTo6cmVwb3J0RXhjZXB0aW9uKCkgbmVlZHMgdG8gYmUgYWJsZSB0byBhY2NlcHQg YSByYXcgdGhyb3duIHZhbHVlIGluIGFkZGl0aW9uIHRvIEV4Y2VwdGlvbiBvYmplY3RzLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC93aW4v Q2hhbmdlTG9nCmluZGV4IDRlMTg1YTkwNDI2ZDM3NmYwZjkyNmFhZjQ0ODIyZTkyZDZkYzViOWIu LmRhY2MxZDAxZWEzZjUzNGNjMDVhYzg4YjliOTkyYjRkZWI1YWM0ZDIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNS0wNi0xMiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw bGUuY29tPgorCisgICAgICAgIFtXSzJdIEFQSTo6TmF2aWdhdGlvbiBvYmplY3RzIGFyZSBsZWFr ZWQgb24gaGlzdG9yeSBuYXZpZ2F0aW9uIHRvIEhpc3RvcnlJdGVtcyBpbiBQYWdlQ2FjaGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTk0OAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBlbXB0eSBp bXBsZW1lbnRhdGlvbiBmb3IgbmV3CisgICAgICAgIEZyYW1lTG9hZGVyQ2xpZW50Ojp1cGRhdGVk Q2FjaGVkRG9jdW1lbnRMb2FkZXIoKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50Lmg6CisKIDIwMTUtMDYtMTEgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBw bGUuY29tPgogCiAgICAgICAgIFdlYkNvcmU6OnJlcG9ydEV4Y2VwdGlvbigpIG5lZWRzIHRvIGJl IGFibGUgdG8gYWNjZXB0IGEgcmF3IHRocm93biB2YWx1ZSBpbiBhZGRpdGlvbiB0byBFeGNlcHRp b24gb2JqZWN0cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA1YzY4ZDU5MTE4OTI1NWM4MGYxMDM2YTQ1MWYyZmU5 ZTk1YjkyOTVkLi5jOGVhYTMzYjAxNTIyMjE5N2MxYmE0YzM1ZTZmMjcwZTY4NTU4NTczIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTUtMDYtMTIgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KKworICAgICAgICBbV0syXSBBUEk6Ok5hdmlnYXRpb24gb2JqZWN0cyBhcmUg bGVha2VkIG9uIGhpc3RvcnkgbmF2aWdhdGlvbiB0byBIaXN0b3J5SXRlbXMgaW4gUGFnZUNhY2hl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU5NDgK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBUEk6Ok5h dmlnYXRpb24gb2JqZWN0cyB3ZXJlIGxlYWtlZCBvbiBoaXN0b3J5IG5hdmlnYXRpb24gdG8KKyAg ICAgICAgSGlzdG9yeUl0ZW1zIGluIFBhZ2VDYWNoZS4gSW4gc3VjaCBjYXNlLCB3ZSB3b3VsZCBj cmVhdGUgMiBOYXZpZ2F0aW9uCisgICAgICAgIG9iamVjdHMgaW5zdGVhZCBvZiAxIGFuZCB0aGUg Zmlyc3Qgb25lIHdvdWxkIGJlIGxlYWtlZC4gVGhlIHJlYXNvbgorICAgICAgICB3ZSBjcmVhdGUg dGhlIHNlY29uZCBvbmUgaXMgYmVjYXVzZSB3ZSBmYWlsIHRvIHBhc3MgYWxvbmcgdGhlCisgICAg ICAgIG5hdmlnYXRpb25JRCBmcm9tIHRoZSBVSVByb2Nlc3MgdG8gdGhlIFdlYlByb2Nlc3MgYW5k IHRoZW4gYmFjayB0byB0aGUKKyAgICAgICAgVUlQcm9jZXNzLiBPbiB0aGUgSVBDIGJhY2sgdG8g dGhlIFVJUHJvY2VzcywgdGhlIG5hdmlnYXRpb25JRCBlbmRzIHVwCisgICAgICAgIGJlaW5nIDAg c28gdGhlIFVJUHJvY2VzcyBjcmVhdGVzIGEgbmV3IE5hdmlnYXRpb24gb2JqZWN0LCB0aGlua2lu ZyB0aGF0CisgICAgICAgIHRoZSBsb2FkIHdhcyB0cmlnZ2VyZWQgYnkgdGhlIFdlYkNvbnRlbnQg cHJvY2Vzcy4KKworICAgICAgICBXZSBub3cgcGFzcyBhbG9uZyB0aGUgbmF2aWdhdGlvbklELCBl dmVuIGlmIHRoZSBIaXN0b3J5SXRlbSBpcyBpbiB0aGUKKyAgICAgICAgUGFnZUNhY2hlIGFuZCB3 ZSBlbmQgdXAgcmV1c2luZyB0aGUgY2FjaGVkIERvY3VtZW50TG9hZGVyLCBpbnN0ZWFkIG9mCisg ICAgICAgIGNyZWF0aW5nIGEgbmV3IG9uZS4gQSBuZXcgdXBkYXRlQ2FjaGVkRG9jdW1lbnRMb2Fk ZXIoKSBkZWxlZ2F0ZSBpcworICAgICAgICBhZGRlZCB0byB0aGUgRnJhbWVMb2FkZXJDbGllbnQs IHNpbWlsYXJseSB0byB0aGUgcHJlLWV4aXN0aW5nCisgICAgICAgIGNyZWF0ZURvY3VtZW50TG9h ZGVyKCkgYnV0IGZvciB0aGUgY2FzZSB3aGVyZSB0aGUgRG9jdW1lbnRMb2FkZXIgZ2V0cworICAg ICAgICByZXVzZWQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGll bnQ6OnVwZGF0ZUNhY2hlZERvY3VtZW50TG9hZGVyKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpnb0Zvcndh cmQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpnb0JhY2spOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlOjpnb1RvQmFja0ZvcndhcmRJdGVtKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6dXBkYXRlQ2FjaGVkRG9jdW1lbnRMb2FkZXIpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmg6CisKIDIwMTUtMDYtMTIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2Nh QGFwcGxlLmNvbT4KIAogICAgICAgICBDbGVhbiB1cCBJbmRleGVkREIgd2Vic2l0ZSBkYXRhIHJl dHJpZXZhbCBhbmQgcmVtb3ZhbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Vt cHR5Q2xpZW50cy5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oCmluZGV4 IGRkZWU0YTYwYWNmZjFhMzc5ZjdhOWY3ZjgyMmVjYmQwNGNkNmIyNjUuLjYwNDhmZmI1NzAwOTZl OWE2NDNlNjhmM2U4MzBlOWEyN2YxYzBkOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9FbXB0eUNsaWVudHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGll bnRzLmgKQEAgLTM0Nyw2ICszNDcsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHByZXBh cmVGb3JEYXRhU291cmNlUmVwbGFjZW1lbnQoKSBvdmVycmlkZSB7IH0KIAogICAgIHZpcnR1YWwg UGFzc1JlZlB0cjxEb2N1bWVudExvYWRlcj4gY3JlYXRlRG9jdW1lbnRMb2FkZXIoY29uc3QgUmVz b3VyY2VSZXF1ZXN0JiwgY29uc3QgU3Vic3RpdHV0ZURhdGEmKSBvdmVycmlkZTsKKyAgICB2aXJ0 dWFsIHZvaWQgdXBkYXRlQ2FjaGVkRG9jdW1lbnRMb2FkZXIoRG9jdW1lbnRMb2FkZXImKSBvdmVy cmlkZSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgc2V0VGl0bGUoY29uc3QgU3RyaW5nV2l0aERpcmVj dGlvbiYsIGNvbnN0IFVSTCYpIG92ZXJyaWRlIHsgfQogCiAgICAgdmlydHVhbCBTdHJpbmcgdXNl ckFnZW50KGNvbnN0IFVSTCYpIG92ZXJyaWRlIHsgcmV0dXJuICIiOyB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCA2MjhlNjdkZWQ5Y2EwODM3NjQ1ZmZkNzhhZjg0MDAz OWJkZWQwODkyLi4yZWY5NTAwODJmNTQ0YTM1NzNjNzQ3NzMzNzJhYTUwMWNkYWVlYzFlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTMxNzcsNiArMzE3Nyw3IEBAIHZv aWQgRnJhbWVMb2FkZXI6OmxvYWREaWZmZXJlbnREb2N1bWVudEl0ZW0oSGlzdG9yeUl0ZW0mIGl0 ZW0sIEZyYW1lTG9hZFR5cGUgbG9hCiAKICAgICBpZiAoQ2FjaGVkUGFnZSogY2FjaGVkUGFnZSA9 IFBhZ2VDYWNoZTo6c2luZ2xldG9uKCkuZ2V0KGl0ZW0sIG1fZnJhbWUucGFnZSgpKSkgewogICAg ICAgICBhdXRvIGRvY3VtZW50TG9hZGVyID0gY2FjaGVkUGFnZS0+ZG9jdW1lbnRMb2FkZXIoKTsK KyAgICAgICAgbV9jbGllbnQudXBkYXRlQ2FjaGVkRG9jdW1lbnRMb2FkZXIoKmRvY3VtZW50TG9h ZGVyKTsKICAgICAgICAgZG9jdW1lbnRMb2FkZXItPnNldFRyaWdnZXJpbmdBY3Rpb24oTmF2aWdh dGlvbkFjdGlvbihkb2N1bWVudExvYWRlci0+cmVxdWVzdCgpLCBsb2FkVHlwZSwgZmFsc2UpKTsK ICAgICAgICAgZG9jdW1lbnRMb2FkZXItPnNldExhc3RDaGVja2VkUmVxdWVzdChSZXNvdXJjZVJl cXVlc3QoKSk7CiAgICAgICAgIGxvYWRXaXRoRG9jdW1lbnRMb2FkZXIoZG9jdW1lbnRMb2FkZXIs IGxvYWRUeXBlLCAwLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6Olllcyk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCmluZGV4IGFmYWJhNmFmMDRlMWMxNjNh YWFiZmY4OTZhYTNjYWYwMjk2ZDFmYzQuLmMxM2ExOTYxZjQyY2I4N2Q4MGMwNWZmMzFiZTRjYmI1 NGZlNGE1NjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNs aWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCkBA IC0yNTEsNiArMjUxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2aXJ0dWFsIHZv aWQgcHJlcGFyZUZvckRhdGFTb3VyY2VSZXBsYWNlbWVudCgpID0gMDsKIAogICAgICAgICB2aXJ0 dWFsIFBhc3NSZWZQdHI8RG9jdW1lbnRMb2FkZXI+IGNyZWF0ZURvY3VtZW50TG9hZGVyKGNvbnN0 IFJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFN1YnN0aXR1dGVEYXRhJikgPSAwOworICAgICAgICB2 aXJ0dWFsIHZvaWQgdXBkYXRlQ2FjaGVkRG9jdW1lbnRMb2FkZXIoRG9jdW1lbnRMb2FkZXImKSA9 IDA7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBzZXRUaXRsZShjb25zdCBTdHJpbmdXaXRoRGlyZWN0 aW9uJiwgY29uc3QgVVJMJikgPSAwOwogCiAgICAgICAgIHZpcnR1YWwgU3RyaW5nIHVzZXJBZ2Vu dChjb25zdCBVUkwmKSA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3Jl U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29y ZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCBmNmY5NGEyOTY3NGUyYWE4ZDU5 N2M0ZjJmOTA4NzYzYzVmN2M4ZDI0Li43Y2YxNThmOTZiNjM4YjcyOTQwMjY0MDllMTk3MmUyNDU2 MGJiMGQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJG cmFtZUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKQEAgLTE5Myw2ICsxOTMsNyBAQCBwcml2YXRlOgogICAg IHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hMb2FkKCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lk IHByZXBhcmVGb3JEYXRhU291cmNlUmVwbGFjZW1lbnQoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFs IFBhc3NSZWZQdHI8V2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI+IGNyZWF0ZURvY3VtZW50TG9hZGVy KGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFdlYkNvcmU6OlN1YnN0aXR1 dGVEYXRhJikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUNhY2hlZERvY3VtZW50 TG9hZGVyKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyJikgb3ZlcnJpZGUgeyB9CiAKICAgICB2aXJ0 dWFsIHZvaWQgc2V0VGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVjdGlvbiYsIGNv bnN0IFdlYkNvcmU6OlVSTCYpIG92ZXJyaWRlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYktp dC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCBjNGFjZmM1 ODAyYzc0NjYyYTE0OGJhMTI5MThhMDVjYjJjNDk3MjNiLi44N2I2ZDUxNmFjMzlhOWEwMmVhYzVl N2I1MWVhNzgxYzY2NDMyMTk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3Jl U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dl YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKQEAgLTE1Miw2ICsxNTIsOCBAQCBw dWJsaWM6CiAgICAgdmlydHVhbCBXVEY6OlN0cmluZyB1c2VyQWdlbnQoY29uc3QgV2ViQ29yZTo6 VVJMJikgb3ZlcnJpZGU7CiAKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViQ29yZTo6RG9jdW1l bnRMb2FkZXI+IGNyZWF0ZURvY3VtZW50TG9hZGVyKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCYsIGNvbnN0IFdlYkNvcmU6OlN1YnN0aXR1dGVEYXRhJik7CisgICAgdmlydHVhbCB2b2lk IHVwZGF0ZUNhY2hlZERvY3VtZW50TG9hZGVyKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyJikgb3Zl cnJpZGUgeyB9CisKICAgICB2aXJ0dWFsIHZvaWQgc2V0VGl0bGUoY29uc3QgV2ViQ29yZTo6U3Ry aW5nV2l0aERpcmVjdGlvbiYsIGNvbnN0IFdlYkNvcmU6OlVSTCYpOwogCiAgICAgdmlydHVhbCB2 b2lkIHNhdmVQbGF0Zm9ybURhdGFUb0NhY2hlZEZyYW1lKFdlYkNvcmU6OkNhY2hlZEZyYW1lKikg b3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVT dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDYxYjE0ZWNh ZTQ0NmZhOTQ2MGIwNDhhNThkMzVjMDg4MjMxMjg3NjEuLjgyOWI3Mzc2MTMxZjVhYTI5MWRkOTk4 ZGU3ZTA4NWNjMTFkNDc2YmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCkBA IC0xMjQ2LDYgKzEyNDYsMTEgQEAgUGFzc1JlZlB0cjxEb2N1bWVudExvYWRlcj4gV2ViRnJhbWVM b2FkZXJDbGllbnQ6OmNyZWF0ZURvY3VtZW50TG9hZGVyKGNvbnN0IFJlc28KICAgICByZXR1cm4g bV9mcmFtZS0+cGFnZSgpLT5jcmVhdGVEb2N1bWVudExvYWRlcigqbV9mcmFtZS0+Y29yZUZyYW1l KCksIHJlcXVlc3QsIHN1YnN0aXR1dGVEYXRhKTsKIH0KIAordm9pZCBXZWJGcmFtZUxvYWRlckNs aWVudDo6dXBkYXRlQ2FjaGVkRG9jdW1lbnRMb2FkZXIoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXIm IGxvYWRlcikKK3sKKyAgICBtX2ZyYW1lLT5wYWdlKCktPnVwZGF0ZUNhY2hlZERvY3VtZW50TG9h ZGVyKHN0YXRpY19jYXN0PFdlYkRvY3VtZW50TG9hZGVyJj4obG9hZGVyKSwgKm1fZnJhbWUtPmNv cmVGcmFtZSgpKTsKK30KKwogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6c2V0VGl0bGUoY29u c3QgU3RyaW5nV2l0aERpcmVjdGlvbiYgdGl0bGUsIGNvbnN0IFVSTCYgdXJsKQogewogICAgIFdl YlBhZ2UqIHdlYlBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmggYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp ZW50LmgKaW5kZXggNDY2NWU4NDZjNDkzNjk1YTYyZmJkZGI2NWY2MzZkYWU3Y2NlMzFhYi4uM2Ni MTVlOTQ5NDgxNmY1MThmZTY2NTA3MGIzMjRiNmZlNTQ4NzdjNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVM b2FkZXJDbGllbnQuaApAQCAtMTY0LDYgKzE2NCw4IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2 b2lkIHByZXBhcmVGb3JEYXRhU291cmNlUmVwbGFjZW1lbnQoKSBvdmVycmlkZTsKICAgICAKICAg ICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI+IGNyZWF0ZURvY3Vt ZW50TG9hZGVyKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFdlYkNvcmU6 OlN1YnN0aXR1dGVEYXRhJikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUNhY2hl ZERvY3VtZW50TG9hZGVyKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyJikgb3ZlcnJpZGU7CisKICAg ICB2aXJ0dWFsIHZvaWQgc2V0VGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVjdGlv biYsIGNvbnN0IFdlYkNvcmU6OlVSTCYpIG92ZXJyaWRlOwogICAgIAogICAgIHZpcnR1YWwgU3Ry aW5nIHVzZXJBZ2VudChjb25zdCBXZWJDb3JlOjpVUkwmKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAwMDZhOTFlZTU1NmFh ZjQ5NGI2ZWYyODlkMzhkNDYxYTcwNGY3NzAxLi4zNThlMWMwOGIxZWExYzEwYTg5YjM0NjFiY2Jk MzdjYzg5MGZhZWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCkBAIC0xMTYxLDggKzExNjEsNyBAQCB2b2lkIFdlYlBhZ2U6OmdvRm9yd2FyZCh1 aW50NjRfdCBuYXZpZ2F0aW9uSUQsIHVpbnQ2NF90IGJhY2tGb3J3YXJkSXRlbUlEKQogICAgICAg ICByZXR1cm47CiAKICAgICBBU1NFUlQoIW1fcGVuZGluZ05hdmlnYXRpb25JRCk7Ci0gICAgaWYg KCFpdGVtLT5pc0luUGFnZUNhY2hlKCkpCi0gICAgICAgIG1fcGVuZGluZ05hdmlnYXRpb25JRCA9 IG5hdmlnYXRpb25JRDsKKyAgICBtX3BlbmRpbmdOYXZpZ2F0aW9uSUQgPSBuYXZpZ2F0aW9uSUQ7 CiAKICAgICBtX3BhZ2UtPmdvVG9JdGVtKCppdGVtLCBGcmFtZUxvYWRUeXBlOjpGb3J3YXJkKTsK IH0KQEAgLTExNzcsOCArMTE3Niw3IEBAIHZvaWQgV2ViUGFnZTo6Z29CYWNrKHVpbnQ2NF90IG5h dmlnYXRpb25JRCwgdWludDY0X3QgYmFja0ZvcndhcmRJdGVtSUQpCiAgICAgICAgIHJldHVybjsK IAogICAgIEFTU0VSVCghbV9wZW5kaW5nTmF2aWdhdGlvbklEKTsKLSAgICBpZiAoIWl0ZW0tPmlz SW5QYWdlQ2FjaGUoKSkKLSAgICAgICAgbV9wZW5kaW5nTmF2aWdhdGlvbklEID0gbmF2aWdhdGlv bklEOworICAgIG1fcGVuZGluZ05hdmlnYXRpb25JRCA9IG5hdmlnYXRpb25JRDsKIAogICAgIG1f cGFnZS0+Z29Ub0l0ZW0oKml0ZW0sIEZyYW1lTG9hZFR5cGU6OkJhY2spOwogfQpAQCAtMTE5Myw4 ICsxMTkxLDcgQEAgdm9pZCBXZWJQYWdlOjpnb1RvQmFja0ZvcndhcmRJdGVtKHVpbnQ2NF90IG5h dmlnYXRpb25JRCwgdWludDY0X3QgYmFja0ZvcndhcmRJdGUKICAgICAgICAgcmV0dXJuOwogCiAg ICAgQVNTRVJUKCFtX3BlbmRpbmdOYXZpZ2F0aW9uSUQpOwotICAgIGlmICghaXRlbS0+aXNJblBh Z2VDYWNoZSgpKQotICAgICAgICBtX3BlbmRpbmdOYXZpZ2F0aW9uSUQgPSBuYXZpZ2F0aW9uSUQ7 CisgICAgbV9wZW5kaW5nTmF2aWdhdGlvbklEID0gbmF2aWdhdGlvbklEOwogCiAgICAgbV9wYWdl LT5nb1RvSXRlbSgqaXRlbSwgRnJhbWVMb2FkVHlwZTo6SW5kZXhlZEJhY2tGb3J3YXJkKTsKIH0K QEAgLTQ5MjQsNiArNDkyMSwxNCBAQCBQYXNzUmVmUHRyPERvY3VtZW50TG9hZGVyPiBXZWJQYWdl OjpjcmVhdGVEb2N1bWVudExvYWRlcihGcmFtZSYgZnJhbWUsIGNvbnN0IFJlcwogICAgIHJldHVy biBkb2N1bWVudExvYWRlci5yZWxlYXNlKCk7CiB9CiAKK3ZvaWQgV2ViUGFnZTo6dXBkYXRlQ2Fj aGVkRG9jdW1lbnRMb2FkZXIoV2ViRG9jdW1lbnRMb2FkZXImIGRvY3VtZW50TG9hZGVyLCBGcmFt ZSYgZnJhbWUpCit7CisgICAgaWYgKG1fcGVuZGluZ05hdmlnYXRpb25JRCAmJiBmcmFtZS5pc01h aW5GcmFtZSgpKSB7CisgICAgICAgIGRvY3VtZW50TG9hZGVyLnNldE5hdmlnYXRpb25JRChtX3Bl bmRpbmdOYXZpZ2F0aW9uSUQpOworICAgICAgICBtX3BlbmRpbmdOYXZpZ2F0aW9uSUQgPSAwOwor ICAgIH0KK30KKwogdm9pZCBXZWJQYWdlOjpnZXRCeXRlY29kZVByb2ZpbGUodWludDY0X3QgY2Fs bGJhY2tJRCkKIHsKICAgICBpZiAoIUpTRE9NV2luZG93Ojpjb21tb25WTSgpLm1fcGVyQnl0ZWNv ZGVQcm9maWxlcikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmgKaW5kZXggMDE4MjgxY2QzZDM2YzUzNGYxNTgwMWMyMTI0OTAyYThjZTQ2NTgzZS4uZjllNjEz NjgwYTZhMWQ3NmVhZWY1ZDAyZDc4MzJkZDA5MGEyOTUxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC0xNTMsNiArMTUzLDcgQEAgY2xhc3MgVmlz aWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbzsKIGNsYXNzIFdlYkNvbG9yQ2hvb3NlcjsKIGNsYXNz IFdlYkNvbnRleHRNZW51OwogY2xhc3MgV2ViQ29udGV4dE1lbnVJdGVtRGF0YTsKK2NsYXNzIFdl YkRvY3VtZW50TG9hZGVyOwogY2xhc3MgV2ViRXZlbnQ7CiBjbGFzcyBXZWJGcmFtZTsKIGNsYXNz IFdlYkZ1bGxTY3JlZW5NYW5hZ2VyOwpAQCAtODcxLDYgKzg3Miw3IEBAIHB1YmxpYzoKICAgICB2 b2lkIHNldFNjcm9sbGJhck92ZXJsYXlTdHlsZShXVEY6Ok9wdGlvbmFsPHVpbnQzMl90IC8qIFdl YkNvcmU6OlNjcm9sbGJhck92ZXJsYXlTdHlsZSAqLz4gc2Nyb2xsYmFyU3R5bGUpOwogCiAgICAg UGFzc1JlZlB0cjxXZWJDb3JlOjpEb2N1bWVudExvYWRlcj4gY3JlYXRlRG9jdW1lbnRMb2FkZXIo V2ViQ29yZTo6RnJhbWUmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBX ZWJDb3JlOjpTdWJzdGl0dXRlRGF0YSYpOworICAgIHZvaWQgdXBkYXRlQ2FjaGVkRG9jdW1lbnRM b2FkZXIoV2ViRG9jdW1lbnRMb2FkZXImLCBXZWJDb3JlOjpGcmFtZSYpOwogCiAgICAgdm9pZCBn ZXRCeXRlY29kZVByb2ZpbGUodWludDY0X3QgY2FsbGJhY2tJRCk7CiAgICAgCg==