128641 2014-02-11 17:52:14 -0800 DelayedReleaseScope in MarkedAllocator::tryAllocateHelper is racy 2014-02-12 20:19:42 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mhahnenberg mhahnenberg commit-queue ggaren mark.lam oldest_to_newest 979696 0 mhahnenberg 2014-02-11 17:52:14 -0800 It causes the VM to drop the lock in the middle of adding a new block to the allocator, so another thread could come in and add a block before we're done. 979752 1 mhahnenberg 2014-02-11 20:45:42 -0800 (In reply to comment #0) > It causes the VM to drop the lock in the middle of adding a new block to the allocator, so another thread could come in and add a block before we're done. Actually, it was the DelayedReleaseScope in tryAllocateHelper that was wrong. 979756 2 223936 mhahnenberg 2014-02-11 20:57:32 -0800 Created attachment 223936 Patch 979757 3 223936 mhahnenberg 2014-02-11 21:05:16 -0800 Comment on attachment 223936 Patch This still has issues. 979777 4 223941 mhahnenberg 2014-02-11 22:24:35 -0800 Created attachment 223941 Patch 979778 5 223942 mhahnenberg 2014-02-11 22:26:09 -0800 Created attachment 223942 Patch 979860 6 223969 mhahnenberg 2014-02-12 07:05:26 -0800 Created attachment 223969 Patch 979893 7 223969 mark.lam 2014-02-12 10:08:40 -0800 Comment on attachment 223969 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223969&action=review > Source/JavaScriptCore/heap/MarkedAllocator.cpp:109 > + void* head = tryPopFreeList(bytes); > ASSERT(head); According to tryPopFreeList() below, it can return a 0. So, is this assertion still valid? 979894 8 mhahnenberg 2014-02-12 10:09:55 -0800 (In reply to comment #7) > (From update of attachment 223969 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=223969&action=review > > > Source/JavaScriptCore/heap/MarkedAllocator.cpp:109 > > + void* head = tryPopFreeList(bytes); > > ASSERT(head); > > According to tryPopFreeList() below, it can return a 0. So, is this assertion still valid? Yes. We will loop around the while loop until m_freeList.head is not null. If m_freeList.head is not null then tryPopFreeList *must* succeed. 979912 9 223969 oliver 2014-02-12 10:42:40 -0800 Comment on attachment 223969 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223969&action=review > Source/JavaScriptCore/heap/MarkedAllocator.cpp:116 > + ASSERT(m_currentBlock); RELEASE_ASSERT? > Source/JavaScriptCore/heap/MarkedAllocator.cpp:127 > ASSERT(!m_heap->isBusy()); Can we RELEASE_ASSERT here without hurting perf? 979979 10 223996 mhahnenberg 2014-02-12 12:50:57 -0800 Created attachment 223996 Patch 980052 11 223996 msaboff 2014-02-12 15:40:01 -0800 Comment on attachment 223996 Patch r=me 980152 12 223996 commit-queue 2014-02-12 20:19:38 -0800 Comment on attachment 223996 Patch Clearing flags on attachment: 223996 Committed r164009: <http://trac.webkit.org/changeset/164009> 980153 13 commit-queue 2014-02-12 20:19:42 -0800 All reviewed patches have been landed. Closing bug. 223936 2014-02-11 20:57:32 -0800 2014-02-11 22:24:32 -0800 Patch bug-128641-20140211205731.patch text/plain 4109 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYzOTQ0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBA CisyMDE0LTAyLTExICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgRGVsYXllZFJlbGVhc2VTY29wZSBpbiBNYXJrZWRBbGxvY2F0b3I6OnRyeUFsbG9j YXRlSGVscGVyIGlzIHdyb25nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjg2NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBXZSB3ZXJlIGltcHJvcGVybHkgaGFuZGxpbmcgdGhlIGNhc2Ugd2hlcmUgdGhl IERlbGF5ZWRSZWxlYXNlU2NvcGUgCisgICAgICAgIGluIHRyeUFsbG9jYXRlSGVscGVyIHdvdWxk IGNhdXNlIHVzIHRvIGRyb3AgdGhlIEFQSSBsb2NrLCBhbGxvd2luZyAKKyAgICAgICAgYW5vdGhl ciB0aHJlYWQgdG8gc25lYWsgaW4gYW5kIGFsbG9jYXRlIGEgbmV3IGJsb2NrIGFmdGVyIHdlIGhh ZCBhbHJlYWR5IAorICAgICAgICBjb25jbHVkZWQgdGhhdCB0aGVyZSB3ZXJlIG5vIG1vcmUgYmxv Y2tzIHRvIGFsbG9jYXRlIG91dCBvZi4KKworICAgICAgICBUaGUgZml4IGlzIHRvIGNhbGwgdHJ5 QWxsb2NhdGVIZWxwZXIgaW4gYSBsb29wIHVudGlsIHdlIGtub3cgZm9yIHN1cmUgCisgICAgICAg IHRoYXQgdGhpcyBkaWQgbm90IGhhcHBlbi4KKworICAgICAgICAqIGhlYXAvTWFya2VkQWxsb2Nh dG9yLmNwcDoKKyAgICAgICAgKEpTQzo6TWFya2VkQWxsb2NhdG9yOjp0cnlBbGxvY2F0ZUhlbHBl cik6CisgICAgICAgIChKU0M6Ok1hcmtlZEFsbG9jYXRvcjo6dHJ5UG9wRnJlZUxpc3QpOgorICAg ICAgICAoSlNDOjpNYXJrZWRBbGxvY2F0b3I6OnRyeUFsbG9jYXRlKToKKyAgICAgICAgKiBoZWFw L01hcmtlZEFsbG9jYXRvci5oOgorCiAyMDE0LTAyLTExICBGaWxpcCBQaXpsbyAgPGZwaXpsb0Bh cHBsZS5jb20+CiAKICAgICAgICAgRml4IGFzc2VydGlvbnMgYW5kIGluY29ycmVjdCBjb2RlZ2Vu IGZvciBDb21wYXJlRXEoT2JqZWN0T3JPdGhlcjosIE9iamVjdDopCkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRBbGxvY2F0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEFsbG9jYXRvci5jcHAJKHJldmlzaW9uIDE2Mzkx MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEFsbG9jYXRvci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTYyLDExICs2Miw4IEBAIGJvb2wgTWFya2VkQWxsb2NhdG9yOjppc1Bh Z2VkT3V0KGRvdWJsZSAKIAogaW5saW5lIHZvaWQqIE1hcmtlZEFsbG9jYXRvcjo6dHJ5QWxsb2Nh dGVIZWxwZXIoc2l6ZV90IGJ5dGVzKQogewotICAgIC8vIFdlIG5lZWQgYSB3aGlsZSBsb29wIHRv IGNoZWNrIHRoZSBmcmVlIGxpc3QgYmVjYXVzZSB0aGUgRGVsYXllZFJlbGVhc2VTY29wZSAKLSAg ICAvLyBjb3VsZCBjYXVzZSBhcmJpdHJhcnkgY29kZSB0byBleGVjdXRlIGFuZCBleGhhdXN0IHRo ZSBmcmVlIGxpc3QgdGhhdCB3ZSAKLSAgICAvLyB0aG91Z2h0IGhhZCBlbGVtZW50cyBpbiBpdC4K LSAgICB3aGlsZSAoIW1fZnJlZUxpc3QuaGVhZCkgewotICAgICAgICBEZWxheWVkUmVsZWFzZVNj b3BlIGRlbGF5ZWRSZWxlYXNlU2NvcGUoKm1fbWFya2VkU3BhY2UpOworICAgIERlbGF5ZWRSZWxl YXNlU2NvcGUgZGVsYXllZFJlbGVhc2VTY29wZSgqbV9tYXJrZWRTcGFjZSk7CisgICAgaWYgKCFt X2ZyZWVMaXN0LmhlYWQpIHsKICAgICAgICAgaWYgKG1fY3VycmVudEJsb2NrKSB7CiAgICAgICAg ICAgICBBU1NFUlQobV9jdXJyZW50QmxvY2sgPT0gbV9uZXh0QmxvY2tUb1N3ZWVwKTsKICAgICAg ICAgICAgIG1fY3VycmVudEJsb2NrLT5kaWRDb25zdW1lRnJlZUxpc3QoKTsKQEAgLTEwNSwxOSAr MTAyLDQyIEBAIGlubGluZSB2b2lkKiBNYXJrZWRBbGxvY2F0b3I6OnRyeUFsbG9jYXQKICAgICB9 CiAKICAgICBBU1NFUlQobV9mcmVlTGlzdC5oZWFkKTsKLSAgICBNYXJrZWRCbG9jazo6RnJlZUNl bGwqIGhlYWQgPSBtX2ZyZWVMaXN0LmhlYWQ7Ci0gICAgbV9mcmVlTGlzdC5oZWFkID0gaGVhZC0+ bmV4dDsKKyAgICB2b2lkKiBoZWFkID0gdHJ5UG9wRnJlZUxpc3QoYnl0ZXMpOwogICAgIEFTU0VS VChoZWFkKTsKICAgICBtX21hcmtlZFNwYWNlLT5kaWRBbGxvY2F0ZUluQmxvY2sobV9jdXJyZW50 QmxvY2spOwogICAgIHJldHVybiBoZWFkOwogfQotICAgIAorCitpbmxpbmUgdm9pZCogTWFya2Vk QWxsb2NhdG9yOjp0cnlQb3BGcmVlTGlzdChzaXplX3QgYnl0ZXMpCit7CisgICAgQVNTRVJUKG1f Y3VycmVudEJsb2NrKTsKKyAgICBpZiAoYnl0ZXMgPiBtX2N1cnJlbnRCbG9jay0+Y2VsbFNpemUo KSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBNYXJrZWRCbG9jazo6RnJlZUNlbGwqIGhlYWQg PSBtX2ZyZWVMaXN0LmhlYWQ7CisgICAgbV9mcmVlTGlzdC5oZWFkID0gaGVhZC0+bmV4dDsKKyAg ICByZXR1cm4gaGVhZDsKK30KKwogaW5saW5lIHZvaWQqIE1hcmtlZEFsbG9jYXRvcjo6dHJ5QWxs b2NhdGUoc2l6ZV90IGJ5dGVzKQogewogICAgIEFTU0VSVCghbV9oZWFwLT5pc0J1c3koKSk7CiAg ICAgbV9oZWFwLT5tX29wZXJhdGlvbkluUHJvZ3Jlc3MgPSBBbGxvY2F0aW9uOwogICAgIHZvaWQq IHJlc3VsdCA9IHRyeUFsbG9jYXRlSGVscGVyKGJ5dGVzKTsKKworICAgIC8vIER1ZSB0byB0aGUg RGVsYXllZFJlbGVhc2VTY29wZSBpbiB0cnlBbGxvY2F0ZUhlbHBlciwgc29tZSBvdGhlciB0aHJl YWQgbWlnaHQgaGF2ZQorICAgIC8vIGNyZWF0ZWQgYSBuZXcgYmxvY2sgYWZ0ZXIgd2UgdGhvdWdo dCB3ZSBkaWRuJ3QgZmluZCBhbnkgZnJlZSBjZWxscy4gCisgICAgd2hpbGUgKCFyZXN1bHQgJiYg bV9jdXJyZW50QmxvY2spIHsKKyAgICAgICAgLy8gQSBuZXcgYmxvY2sgd2FzIGFkZGVkIGJ5IGFu b3RoZXIgdGhyZWFkIHNvIHRyeSBwb3BwaW5nIHRoZSBmcmVlIGxpc3QuCisgICAgICAgIHJlc3Vs dCA9IHRyeVBvcEZyZWVMaXN0KGJ5dGVzKTsKKyAgICAgICAgaWYgKHJlc3VsdCkKKyAgICAgICAg ICAgIGJyZWFrOworICAgICAgICAvLyBUaGUgZnJlZSBsaXN0IHdhcyBlbXB0eSwgc28gY2FsbCB0 cnlBbGxvY2F0ZUhlbHBlciB0byBkbyB0aGUgbm9ybWFsIHN3ZWVwaW5nIHN0dWZmLgorICAgICAg ICByZXN1bHQgPSB0cnlBbGxvY2F0ZUhlbHBlcihieXRlcyk7CisgICAgfQorCiAgICAgbV9oZWFw LT5tX29wZXJhdGlvbkluUHJvZ3Jlc3MgPSBOb09wZXJhdGlvbjsKKyAgICBBU1NFUlQocmVzdWx0 IHx8ICFtX2N1cnJlbnRCbG9jayk7CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KICAgICAKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEFsbG9jYXRvci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEFsbG9jYXRvci5oCShyZXZpc2lv biAxNjM5MTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRBbGxvY2F0b3Iu aAkod29ya2luZyBjb3B5KQpAQCAtNDcsNiArNDcsNyBAQCBwcml2YXRlOgogICAgIEpTX0VYUE9S VF9QUklWQVRFIHZvaWQqIGFsbG9jYXRlU2xvd0Nhc2Uoc2l6ZV90KTsKICAgICB2b2lkKiB0cnlB bGxvY2F0ZShzaXplX3QpOwogICAgIHZvaWQqIHRyeUFsbG9jYXRlSGVscGVyKHNpemVfdCk7Cisg ICAgdm9pZCogdHJ5UG9wRnJlZUxpc3Qoc2l6ZV90KTsKICAgICBNYXJrZWRCbG9jayogYWxsb2Nh dGVCbG9jayhzaXplX3QpOwogICAgIAogICAgIE1hcmtlZEJsb2NrOjpGcmVlTGlzdCBtX2ZyZWVM aXN0Owo= 223941 2014-02-11 22:24:35 -0800 2014-02-11 22:26:06 -0800 Patch bug-128641-20140211222434.patch text/plain 4198 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYzOTQ0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBA CisyMDE0LTAyLTExICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgRGVsYXllZFJlbGVhc2VTY29wZSBpbiBNYXJrZWRBbGxvY2F0b3I6OnRyeUFsbG9j YXRlSGVscGVyIGlzIHdyb25nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjg2NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBXZSB3ZXJlIGltcHJvcGVybHkgaGFuZGxpbmcgdGhlIGNhc2Ugd2hlcmUgdGhl IERlbGF5ZWRSZWxlYXNlU2NvcGUgCisgICAgICAgIGluIHRyeUFsbG9jYXRlSGVscGVyIHdvdWxk IGNhdXNlIHVzIHRvIGRyb3AgdGhlIEFQSSBsb2NrLCBhbGxvd2luZyAKKyAgICAgICAgYW5vdGhl ciB0aHJlYWQgdG8gc25lYWsgaW4gYW5kIGFsbG9jYXRlIGEgbmV3IGJsb2NrIGFmdGVyIHdlIGhh ZCBhbHJlYWR5IAorICAgICAgICBjb25jbHVkZWQgdGhhdCB0aGVyZSB3ZXJlIG5vIG1vcmUgYmxv Y2tzIHRvIGFsbG9jYXRlIG91dCBvZi4KKworICAgICAgICBUaGUgZml4IGlzIHRvIGNhbGwgdHJ5 QWxsb2NhdGVIZWxwZXIgaW4gYSBsb29wIHVudGlsIHdlIGtub3cgZm9yIHN1cmUgCisgICAgICAg IHRoYXQgdGhpcyBkaWQgbm90IGhhcHBlbi4KKworICAgICAgICAqIGhlYXAvTWFya2VkQWxsb2Nh dG9yLmNwcDoKKyAgICAgICAgKEpTQzo6TWFya2VkQWxsb2NhdG9yOjp0cnlBbGxvY2F0ZUhlbHBl cik6CisgICAgICAgIChKU0M6Ok1hcmtlZEFsbG9jYXRvcjo6dHJ5UG9wRnJlZUxpc3QpOgorICAg ICAgICAoSlNDOjpNYXJrZWRBbGxvY2F0b3I6OnRyeUFsbG9jYXRlKToKKyAgICAgICAgKiBoZWFw L01hcmtlZEFsbG9jYXRvci5oOgorCiAyMDE0LTAyLTExICBGaWxpcCBQaXpsbyAgPGZwaXpsb0Bh cHBsZS5jb20+CiAKICAgICAgICAgRml4IGFzc2VydGlvbnMgYW5kIGluY29ycmVjdCBjb2RlZ2Vu IGZvciBDb21wYXJlRXEoT2JqZWN0T3JPdGhlcjosIE9iamVjdDopCkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRBbGxvY2F0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEFsbG9jYXRvci5jcHAJKHJldmlzaW9uIDE2Mzkx MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEFsbG9jYXRvci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTYyLDkgKzYyLDYgQEAgYm9vbCBNYXJrZWRBbGxvY2F0b3I6OmlzUGFn ZWRPdXQoZG91YmxlIAogCiBpbmxpbmUgdm9pZCogTWFya2VkQWxsb2NhdG9yOjp0cnlBbGxvY2F0 ZUhlbHBlcihzaXplX3QgYnl0ZXMpCiB7Ci0gICAgLy8gV2UgbmVlZCBhIHdoaWxlIGxvb3AgdG8g Y2hlY2sgdGhlIGZyZWUgbGlzdCBiZWNhdXNlIHRoZSBEZWxheWVkUmVsZWFzZVNjb3BlIAotICAg IC8vIGNvdWxkIGNhdXNlIGFyYml0cmFyeSBjb2RlIHRvIGV4ZWN1dGUgYW5kIGV4aGF1c3QgdGhl IGZyZWUgbGlzdCB0aGF0IHdlIAotICAgIC8vIHRob3VnaHQgaGFkIGVsZW1lbnRzIGluIGl0Lgog ICAgIHdoaWxlICghbV9mcmVlTGlzdC5oZWFkKSB7CiAgICAgICAgIERlbGF5ZWRSZWxlYXNlU2Nv cGUgZGVsYXllZFJlbGVhc2VTY29wZSgqbV9tYXJrZWRTcGFjZSk7CiAgICAgICAgIGlmIChtX2N1 cnJlbnRCbG9jaykgewpAQCAtMTA1LDE5ICsxMDIsNDIgQEAgaW5saW5lIHZvaWQqIE1hcmtlZEFs bG9jYXRvcjo6dHJ5QWxsb2NhdAogICAgIH0KIAogICAgIEFTU0VSVChtX2ZyZWVMaXN0LmhlYWQp OwotICAgIE1hcmtlZEJsb2NrOjpGcmVlQ2VsbCogaGVhZCA9IG1fZnJlZUxpc3QuaGVhZDsKLSAg ICBtX2ZyZWVMaXN0LmhlYWQgPSBoZWFkLT5uZXh0OworICAgIHZvaWQqIGhlYWQgPSB0cnlQb3BG cmVlTGlzdChieXRlcyk7CiAgICAgQVNTRVJUKGhlYWQpOwogICAgIG1fbWFya2VkU3BhY2UtPmRp ZEFsbG9jYXRlSW5CbG9jayhtX2N1cnJlbnRCbG9jayk7CiAgICAgcmV0dXJuIGhlYWQ7CiB9Ci0g ICAgCisKK2lubGluZSB2b2lkKiBNYXJrZWRBbGxvY2F0b3I6OnRyeVBvcEZyZWVMaXN0KHNpemVf dCBieXRlcykKK3sKKyAgICBBU1NFUlQobV9jdXJyZW50QmxvY2spOworICAgIGlmIChieXRlcyA+ IG1fY3VycmVudEJsb2NrLT5jZWxsU2l6ZSgpKQorICAgICAgICByZXR1cm4gMDsKKworICAgIE1h cmtlZEJsb2NrOjpGcmVlQ2VsbCogaGVhZCA9IG1fZnJlZUxpc3QuaGVhZDsKKyAgICBtX2ZyZWVM aXN0LmhlYWQgPSBoZWFkLT5uZXh0OworICAgIHJldHVybiBoZWFkOworfQorCiBpbmxpbmUgdm9p ZCogTWFya2VkQWxsb2NhdG9yOjp0cnlBbGxvY2F0ZShzaXplX3QgYnl0ZXMpCiB7CiAgICAgQVNT RVJUKCFtX2hlYXAtPmlzQnVzeSgpKTsKICAgICBtX2hlYXAtPm1fb3BlcmF0aW9uSW5Qcm9ncmVz cyA9IEFsbG9jYXRpb247CiAgICAgdm9pZCogcmVzdWx0ID0gdHJ5QWxsb2NhdGVIZWxwZXIoYnl0 ZXMpOworCisgICAgLy8gRHVlIHRvIHRoZSBEZWxheWVkUmVsZWFzZVNjb3BlIGluIHRyeUFsbG9j YXRlSGVscGVyLCBzb21lIG90aGVyIHRocmVhZCBtaWdodCBoYXZlCisgICAgLy8gY3JlYXRlZCBh IG5ldyBibG9jayBhZnRlciB3ZSB0aG91Z2h0IHdlIGRpZG4ndCBmaW5kIGFueSBmcmVlIGNlbGxz LiAKKyAgICB3aGlsZSAoIXJlc3VsdCAmJiBtX2N1cnJlbnRCbG9jaykgeworICAgICAgICAvLyBB IG5ldyBibG9jayB3YXMgYWRkZWQgYnkgYW5vdGhlciB0aHJlYWQgc28gdHJ5IHBvcHBpbmcgdGhl IGZyZWUgbGlzdC4KKyAgICAgICAgcmVzdWx0ID0gdHJ5UG9wRnJlZUxpc3QoYnl0ZXMpOworICAg ICAgICBpZiAocmVzdWx0KQorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIC8vIFRoZSBmcmVl IGxpc3Qgd2FzIGVtcHR5LCBzbyBjYWxsIHRyeUFsbG9jYXRlSGVscGVyIHRvIGRvIHRoZSBub3Jt YWwgc3dlZXBpbmcgc3R1ZmYuCisgICAgICAgIHJlc3VsdCA9IHRyeUFsbG9jYXRlSGVscGVyKGJ5 dGVzKTsKKyAgICB9CisKICAgICBtX2hlYXAtPm1fb3BlcmF0aW9uSW5Qcm9ncmVzcyA9IE5vT3Bl cmF0aW9uOworICAgIEFTU0VSVChyZXN1bHQgfHwgIW1fY3VycmVudEJsb2NrKTsKICAgICByZXR1 cm4gcmVzdWx0OwogfQogICAgIApAQCAtMTcxLDcgKzE5MSw2IEBAIE1hcmtlZEJsb2NrKiBNYXJr ZWRBbGxvY2F0b3I6OmFsbG9jYXRlQmwKIAogdm9pZCBNYXJrZWRBbGxvY2F0b3I6OmFkZEJsb2Nr KE1hcmtlZEJsb2NrKiBibG9jaykKIHsKLSAgICAvLyBTYXRpc2Z5IHRoZSBBU1NFUlQgaW4gTWFy a2VkQmxvY2s6OnN3ZWVwLgogICAgIERlbGF5ZWRSZWxlYXNlU2NvcGUgZGVsYXllZFJlbGVhc2VT Y29wZSgqbV9tYXJrZWRTcGFjZSk7CiAgICAgQVNTRVJUKCFtX2N1cnJlbnRCbG9jayk7CiAgICAg QVNTRVJUKCFtX2ZyZWVMaXN0LmhlYWQpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvTWFya2VkQWxsb2NhdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2hlYXAvTWFya2VkQWxsb2NhdG9yLmgJKHJldmlzaW9uIDE2MzkxMCkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9oZWFwL01hcmtlZEFsbG9jYXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw2 ICs0Nyw3IEBAIHByaXZhdGU6CiAgICAgSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCogYWxsb2NhdGVT bG93Q2FzZShzaXplX3QpOwogICAgIHZvaWQqIHRyeUFsbG9jYXRlKHNpemVfdCk7CiAgICAgdm9p ZCogdHJ5QWxsb2NhdGVIZWxwZXIoc2l6ZV90KTsKKyAgICB2b2lkKiB0cnlQb3BGcmVlTGlzdChz aXplX3QpOwogICAgIE1hcmtlZEJsb2NrKiBhbGxvY2F0ZUJsb2NrKHNpemVfdCk7CiAgICAgCiAg ICAgTWFya2VkQmxvY2s6OkZyZWVMaXN0IG1fZnJlZUxpc3Q7Cg== 223942 2014-02-11 22:26:09 -0800 2014-02-12 07:05:18 -0800 Patch bug-128641-20140211222608.patch text/plain 3740 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYzOTQ0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBA CisyMDE0LTAyLTExICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgRGVsYXllZFJlbGVhc2VTY29wZSBpbiBNYXJrZWRBbGxvY2F0b3I6OnRyeUFsbG9j YXRlSGVscGVyIGlzIHdyb25nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjg2NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBXZSB3ZXJlIGltcHJvcGVybHkgaGFuZGxpbmcgdGhlIGNhc2Ugd2hlcmUgdGhl IERlbGF5ZWRSZWxlYXNlU2NvcGUgCisgICAgICAgIGluIHRyeUFsbG9jYXRlSGVscGVyIHdvdWxk IGNhdXNlIHVzIHRvIGRyb3AgdGhlIEFQSSBsb2NrLCBhbGxvd2luZyAKKyAgICAgICAgYW5vdGhl ciB0aHJlYWQgdG8gc25lYWsgaW4gYW5kIGFsbG9jYXRlIGEgbmV3IGJsb2NrIGFmdGVyIHdlIGhh ZCBhbHJlYWR5IAorICAgICAgICBjb25jbHVkZWQgdGhhdCB0aGVyZSB3ZXJlIG5vIG1vcmUgYmxv Y2tzIHRvIGFsbG9jYXRlIG91dCBvZi4KKworICAgICAgICBUaGUgZml4IGlzIHRvIGNhbGwgdHJ5 QWxsb2NhdGVIZWxwZXIgaW4gYSBsb29wIHVudGlsIHdlIGtub3cgZm9yIHN1cmUgCisgICAgICAg IHRoYXQgdGhpcyBkaWQgbm90IGhhcHBlbi4KKworICAgICAgICAqIGhlYXAvTWFya2VkQWxsb2Nh dG9yLmNwcDoKKyAgICAgICAgKEpTQzo6TWFya2VkQWxsb2NhdG9yOjp0cnlBbGxvY2F0ZUhlbHBl cik6CisgICAgICAgIChKU0M6Ok1hcmtlZEFsbG9jYXRvcjo6dHJ5UG9wRnJlZUxpc3QpOgorICAg ICAgICAoSlNDOjpNYXJrZWRBbGxvY2F0b3I6OnRyeUFsbG9jYXRlKToKKyAgICAgICAgKiBoZWFw L01hcmtlZEFsbG9jYXRvci5oOgorCiAyMDE0LTAyLTExICBGaWxpcCBQaXpsbyAgPGZwaXpsb0Bh cHBsZS5jb20+CiAKICAgICAgICAgRml4IGFzc2VydGlvbnMgYW5kIGluY29ycmVjdCBjb2RlZ2Vu IGZvciBDb21wYXJlRXEoT2JqZWN0T3JPdGhlcjosIE9iamVjdDopCkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRBbGxvY2F0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEFsbG9jYXRvci5jcHAJKHJldmlzaW9uIDE2Mzkx MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEFsbG9jYXRvci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTEwNSwxOSArMTA1LDQyIEBAIGlubGluZSB2b2lkKiBNYXJrZWRBbGxv Y2F0b3I6OnRyeUFsbG9jYXQKICAgICB9CiAKICAgICBBU1NFUlQobV9mcmVlTGlzdC5oZWFkKTsK LSAgICBNYXJrZWRCbG9jazo6RnJlZUNlbGwqIGhlYWQgPSBtX2ZyZWVMaXN0LmhlYWQ7Ci0gICAg bV9mcmVlTGlzdC5oZWFkID0gaGVhZC0+bmV4dDsKKyAgICB2b2lkKiBoZWFkID0gdHJ5UG9wRnJl ZUxpc3QoYnl0ZXMpOwogICAgIEFTU0VSVChoZWFkKTsKICAgICBtX21hcmtlZFNwYWNlLT5kaWRB bGxvY2F0ZUluQmxvY2sobV9jdXJyZW50QmxvY2spOwogICAgIHJldHVybiBoZWFkOwogfQotICAg IAorCitpbmxpbmUgdm9pZCogTWFya2VkQWxsb2NhdG9yOjp0cnlQb3BGcmVlTGlzdChzaXplX3Qg Ynl0ZXMpCit7CisgICAgQVNTRVJUKG1fY3VycmVudEJsb2NrKTsKKyAgICBpZiAoYnl0ZXMgPiBt X2N1cnJlbnRCbG9jay0+Y2VsbFNpemUoKSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBNYXJr ZWRCbG9jazo6RnJlZUNlbGwqIGhlYWQgPSBtX2ZyZWVMaXN0LmhlYWQ7CisgICAgbV9mcmVlTGlz dC5oZWFkID0gaGVhZC0+bmV4dDsKKyAgICByZXR1cm4gaGVhZDsKK30KKwogaW5saW5lIHZvaWQq IE1hcmtlZEFsbG9jYXRvcjo6dHJ5QWxsb2NhdGUoc2l6ZV90IGJ5dGVzKQogewogICAgIEFTU0VS VCghbV9oZWFwLT5pc0J1c3koKSk7CiAgICAgbV9oZWFwLT5tX29wZXJhdGlvbkluUHJvZ3Jlc3Mg PSBBbGxvY2F0aW9uOwogICAgIHZvaWQqIHJlc3VsdCA9IHRyeUFsbG9jYXRlSGVscGVyKGJ5dGVz KTsKKworICAgIC8vIER1ZSB0byB0aGUgRGVsYXllZFJlbGVhc2VTY29wZSBpbiB0cnlBbGxvY2F0 ZUhlbHBlciwgc29tZSBvdGhlciB0aHJlYWQgbWlnaHQgaGF2ZQorICAgIC8vIGNyZWF0ZWQgYSBu ZXcgYmxvY2sgYWZ0ZXIgd2UgdGhvdWdodCB3ZSBkaWRuJ3QgZmluZCBhbnkgZnJlZSBjZWxscy4g CisgICAgd2hpbGUgKCFyZXN1bHQgJiYgbV9jdXJyZW50QmxvY2spIHsKKyAgICAgICAgLy8gQSBu ZXcgYmxvY2sgd2FzIGFkZGVkIGJ5IGFub3RoZXIgdGhyZWFkIHNvIHRyeSBwb3BwaW5nIHRoZSBm cmVlIGxpc3QuCisgICAgICAgIHJlc3VsdCA9IHRyeVBvcEZyZWVMaXN0KGJ5dGVzKTsKKyAgICAg ICAgaWYgKHJlc3VsdCkKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICAvLyBUaGUgZnJlZSBs aXN0IHdhcyBlbXB0eSwgc28gY2FsbCB0cnlBbGxvY2F0ZUhlbHBlciB0byBkbyB0aGUgbm9ybWFs IHN3ZWVwaW5nIHN0dWZmLgorICAgICAgICByZXN1bHQgPSB0cnlBbGxvY2F0ZUhlbHBlcihieXRl cyk7CisgICAgfQorCiAgICAgbV9oZWFwLT5tX29wZXJhdGlvbkluUHJvZ3Jlc3MgPSBOb09wZXJh dGlvbjsKKyAgICBBU1NFUlQocmVzdWx0IHx8ICFtX2N1cnJlbnRCbG9jayk7CiAgICAgcmV0dXJu IHJlc3VsdDsKIH0KICAgICAKQEAgLTE3MSw3ICsxOTQsNiBAQCBNYXJrZWRCbG9jayogTWFya2Vk QWxsb2NhdG9yOjphbGxvY2F0ZUJsCiAKIHZvaWQgTWFya2VkQWxsb2NhdG9yOjphZGRCbG9jayhN YXJrZWRCbG9jayogYmxvY2spCiB7Ci0gICAgLy8gU2F0aXNmeSB0aGUgQVNTRVJUIGluIE1hcmtl ZEJsb2NrOjpzd2VlcC4KICAgICBEZWxheWVkUmVsZWFzZVNjb3BlIGRlbGF5ZWRSZWxlYXNlU2Nv cGUoKm1fbWFya2VkU3BhY2UpOwogICAgIEFTU0VSVCghbV9jdXJyZW50QmxvY2spOwogICAgIEFT U0VSVCghbV9mcmVlTGlzdC5oZWFkKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFw L01hcmtlZEFsbG9jYXRvci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9o ZWFwL01hcmtlZEFsbG9jYXRvci5oCShyZXZpc2lvbiAxNjM5MTApCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvaGVhcC9NYXJrZWRBbGxvY2F0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtNDcsNiAr NDcsNyBAQCBwcml2YXRlOgogICAgIEpTX0VYUE9SVF9QUklWQVRFIHZvaWQqIGFsbG9jYXRlU2xv d0Nhc2Uoc2l6ZV90KTsKICAgICB2b2lkKiB0cnlBbGxvY2F0ZShzaXplX3QpOwogICAgIHZvaWQq IHRyeUFsbG9jYXRlSGVscGVyKHNpemVfdCk7CisgICAgdm9pZCogdHJ5UG9wRnJlZUxpc3Qoc2l6 ZV90KTsKICAgICBNYXJrZWRCbG9jayogYWxsb2NhdGVCbG9jayhzaXplX3QpOwogICAgIAogICAg IE1hcmtlZEJsb2NrOjpGcmVlTGlzdCBtX2ZyZWVMaXN0Owo= 223969 2014-02-12 07:05:26 -0800 2014-02-12 12:50:55 -0800 Patch bug-128641-20140212070525.patch text/plain 4635 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYzOTQ0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBA CisyMDE0LTAyLTExICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgRGVsYXllZFJlbGVhc2VTY29wZSBpbiBNYXJrZWRBbGxvY2F0b3I6OnRyeUFsbG9j YXRlSGVscGVyIGlzIHdyb25nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjg2NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBXZSB3ZXJlIGltcHJvcGVybHkgaGFuZGxpbmcgdGhlIGNhc2Ugd2hlcmUgdGhl IERlbGF5ZWRSZWxlYXNlU2NvcGUgCisgICAgICAgIGluIHRyeUFsbG9jYXRlSGVscGVyIHdvdWxk IGNhdXNlIHVzIHRvIGRyb3AgdGhlIEFQSSBsb2NrLCBhbGxvd2luZyAKKyAgICAgICAgYW5vdGhl ciB0aHJlYWQgdG8gc25lYWsgaW4gYW5kIGFsbG9jYXRlIGEgbmV3IGJsb2NrIGFmdGVyIHdlIGhh ZCBhbHJlYWR5IAorICAgICAgICBjb25jbHVkZWQgdGhhdCB0aGVyZSB3ZXJlIG5vIG1vcmUgYmxv Y2tzIHRvIGFsbG9jYXRlIG91dCBvZi4KKworICAgICAgICBUaGUgZml4IGlzIHRvIGNhbGwgdHJ5 QWxsb2NhdGVIZWxwZXIgaW4gYSBsb29wIHVudGlsIHdlIGtub3cgZm9yIHN1cmUgCisgICAgICAg IHRoYXQgdGhpcyBkaWQgbm90IGhhcHBlbi4KKworICAgICAgICBUaGVyZSB3YXMgYWxzbyBhIHJh Y2UgY29uZGl0aW9uIHdpdGggdGhlIERlbGF5ZWRSZWxlYXNlU2NvcGUgaW4gYWRkQmxvY2suCisg ICAgICAgIFdlIHdvdWxkIGFkZCB0aGUgYmxvY2sgdG8gdGhlIE1hcmtlZEJsb2NrJ3MgbGlzdCwg c3dlZXAgaXQsIGFuZCB0aGVuIHJldHVybiwKKyAgICAgICAgY2F1c2luZyB1cyB0byBkcm9wIHRo ZSBBUEkgbG9jayBtb21lbnRhcmlseS4gQW5vdGhlciB0aHJlYWQgY291bGQgdGhlbiAKKyAgICAg ICAgZ3JhYiB0aGUgbG9jaywgYW5kIGFsbG9jYXRlIG91dCBvZiB0aGUgbmV3IGJsb2NrIHRvIHRo ZSBwb2ludCB3aGVyZSB0aGUgCisgICAgICAgIGZyZWUgbGlzdCB3YXMgZW1wdHkuIFRoZW4gd2Ug d291bGQgcmV0dXJuIHRvIHRoZSBvcmlnaW5hbCB0aHJlYWQsIHdobyB0aGlua3MgCisgICAgICAg IGl0J3MgaW1wb3NzaWJsZSB0byBub3QgYWxsb2NhdGUgc3VjY2Vzc2Z1bGx5IGF0IHRoaXMgcG9p bnQuIAorICAgICAgICBJbnN0ZWFkIHdlIHNob3VsZCBqdXN0IGxldCB0cnlBbGxvY2F0ZSBkbyBh bGwgdGhlIGhhcmQgd29yayB3aXRoIGNvcnJlY3RseSAKKyAgICAgICAgc3dlZXBpbmcgYW5kIGdl dHRpbmcgYSB2YWxpZCByZXN1bHQuCisKKyAgICAgICAgKiBoZWFwL01hcmtlZEFsbG9jYXRvci5j cHA6CisgICAgICAgIChKU0M6Ok1hcmtlZEFsbG9jYXRvcjo6dHJ5QWxsb2NhdGVIZWxwZXIpOgor ICAgICAgICAoSlNDOjpNYXJrZWRBbGxvY2F0b3I6OnRyeVBvcEZyZWVMaXN0KToKKyAgICAgICAg KEpTQzo6TWFya2VkQWxsb2NhdG9yOjp0cnlBbGxvY2F0ZSk6CisgICAgICAgIChKU0M6Ok1hcmtl ZEFsbG9jYXRvcjo6YWRkQmxvY2spOgorICAgICAgICAqIGhlYXAvTWFya2VkQWxsb2NhdG9yLmg6 CisKIDIwMTQtMDItMTEgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAg ICBGaXggYXNzZXJ0aW9ucyBhbmQgaW5jb3JyZWN0IGNvZGVnZW4gZm9yIENvbXBhcmVFcShPYmpl Y3RPck90aGVyOiwgT2JqZWN0OikKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01h cmtlZEFsbG9jYXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvTWFya2VkQWxsb2NhdG9yLmNwcAkocmV2aXNpb24gMTYzOTEwKQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL2hlYXAvTWFya2VkQWxsb2NhdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA1 LDE5ICsxMDUsNDIgQEAgaW5saW5lIHZvaWQqIE1hcmtlZEFsbG9jYXRvcjo6dHJ5QWxsb2NhdAog ICAgIH0KIAogICAgIEFTU0VSVChtX2ZyZWVMaXN0LmhlYWQpOwotICAgIE1hcmtlZEJsb2NrOjpG cmVlQ2VsbCogaGVhZCA9IG1fZnJlZUxpc3QuaGVhZDsKLSAgICBtX2ZyZWVMaXN0LmhlYWQgPSBo ZWFkLT5uZXh0OworICAgIHZvaWQqIGhlYWQgPSB0cnlQb3BGcmVlTGlzdChieXRlcyk7CiAgICAg QVNTRVJUKGhlYWQpOwogICAgIG1fbWFya2VkU3BhY2UtPmRpZEFsbG9jYXRlSW5CbG9jayhtX2N1 cnJlbnRCbG9jayk7CiAgICAgcmV0dXJuIGhlYWQ7CiB9Ci0gICAgCisKK2lubGluZSB2b2lkKiBN YXJrZWRBbGxvY2F0b3I6OnRyeVBvcEZyZWVMaXN0KHNpemVfdCBieXRlcykKK3sKKyAgICBBU1NF UlQobV9jdXJyZW50QmxvY2spOworICAgIGlmIChieXRlcyA+IG1fY3VycmVudEJsb2NrLT5jZWxs U2l6ZSgpKQorICAgICAgICByZXR1cm4gMDsKKworICAgIE1hcmtlZEJsb2NrOjpGcmVlQ2VsbCog aGVhZCA9IG1fZnJlZUxpc3QuaGVhZDsKKyAgICBtX2ZyZWVMaXN0LmhlYWQgPSBoZWFkLT5uZXh0 OworICAgIHJldHVybiBoZWFkOworfQorCiBpbmxpbmUgdm9pZCogTWFya2VkQWxsb2NhdG9yOjp0 cnlBbGxvY2F0ZShzaXplX3QgYnl0ZXMpCiB7CiAgICAgQVNTRVJUKCFtX2hlYXAtPmlzQnVzeSgp KTsKICAgICBtX2hlYXAtPm1fb3BlcmF0aW9uSW5Qcm9ncmVzcyA9IEFsbG9jYXRpb247CiAgICAg dm9pZCogcmVzdWx0ID0gdHJ5QWxsb2NhdGVIZWxwZXIoYnl0ZXMpOworCisgICAgLy8gRHVlIHRv IHRoZSBEZWxheWVkUmVsZWFzZVNjb3BlIGluIHRyeUFsbG9jYXRlSGVscGVyLCBzb21lIG90aGVy IHRocmVhZCBtaWdodCBoYXZlCisgICAgLy8gY3JlYXRlZCBhIG5ldyBibG9jayBhZnRlciB3ZSB0 aG91Z2h0IHdlIGRpZG4ndCBmaW5kIGFueSBmcmVlIGNlbGxzLiAKKyAgICB3aGlsZSAoIXJlc3Vs dCAmJiBtX2N1cnJlbnRCbG9jaykgeworICAgICAgICAvLyBBIG5ldyBibG9jayB3YXMgYWRkZWQg YnkgYW5vdGhlciB0aHJlYWQgc28gdHJ5IHBvcHBpbmcgdGhlIGZyZWUgbGlzdC4KKyAgICAgICAg cmVzdWx0ID0gdHJ5UG9wRnJlZUxpc3QoYnl0ZXMpOworICAgICAgICBpZiAocmVzdWx0KQorICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgIC8vIFRoZSBmcmVlIGxpc3Qgd2FzIGVtcHR5LCBzbyBj YWxsIHRyeUFsbG9jYXRlSGVscGVyIHRvIGRvIHRoZSBub3JtYWwgc3dlZXBpbmcgc3R1ZmYuCisg ICAgICAgIHJlc3VsdCA9IHRyeUFsbG9jYXRlSGVscGVyKGJ5dGVzKTsKKyAgICB9CisKICAgICBt X2hlYXAtPm1fb3BlcmF0aW9uSW5Qcm9ncmVzcyA9IE5vT3BlcmF0aW9uOworICAgIEFTU0VSVChy ZXN1bHQgfHwgIW1fY3VycmVudEJsb2NrKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQogICAgIApA QCAtMTcxLDE0ICsxOTQsMTEgQEAgTWFya2VkQmxvY2sqIE1hcmtlZEFsbG9jYXRvcjo6YWxsb2Nh dGVCbAogCiB2b2lkIE1hcmtlZEFsbG9jYXRvcjo6YWRkQmxvY2soTWFya2VkQmxvY2sqIGJsb2Nr KQogewotICAgIC8vIFNhdGlzZnkgdGhlIEFTU0VSVCBpbiBNYXJrZWRCbG9jazo6c3dlZXAuCi0g ICAgRGVsYXllZFJlbGVhc2VTY29wZSBkZWxheWVkUmVsZWFzZVNjb3BlKCptX21hcmtlZFNwYWNl KTsKICAgICBBU1NFUlQoIW1fY3VycmVudEJsb2NrKTsKICAgICBBU1NFUlQoIW1fZnJlZUxpc3Qu aGVhZCk7CiAgICAgCiAgICAgbV9ibG9ja0xpc3QuYXBwZW5kKGJsb2NrKTsKLSAgICBtX25leHRC bG9ja1RvU3dlZXAgPSBtX2N1cnJlbnRCbG9jayA9IGJsb2NrOwotICAgIG1fZnJlZUxpc3QgPSBi bG9jay0+c3dlZXAoTWFya2VkQmxvY2s6OlN3ZWVwVG9GcmVlTGlzdCk7CisgICAgbV9uZXh0Qmxv Y2tUb1N3ZWVwID0gYmxvY2s7CiAgICAgbV9tYXJrZWRTcGFjZS0+ZGlkQWRkQmxvY2soYmxvY2sp OwogfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRBbGxvY2F0b3Iu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRBbGxvY2F0 b3IuaAkocmV2aXNpb24gMTYzOTEwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTWFy a2VkQWxsb2NhdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDcgQEAgcHJpdmF0ZToK ICAgICBKU19FWFBPUlRfUFJJVkFURSB2b2lkKiBhbGxvY2F0ZVNsb3dDYXNlKHNpemVfdCk7CiAg ICAgdm9pZCogdHJ5QWxsb2NhdGUoc2l6ZV90KTsKICAgICB2b2lkKiB0cnlBbGxvY2F0ZUhlbHBl cihzaXplX3QpOworICAgIHZvaWQqIHRyeVBvcEZyZWVMaXN0KHNpemVfdCk7CiAgICAgTWFya2Vk QmxvY2sqIGFsbG9jYXRlQmxvY2soc2l6ZV90KTsKICAgICAKICAgICBNYXJrZWRCbG9jazo6RnJl ZUxpc3QgbV9mcmVlTGlzdDsK 223996 2014-02-12 12:50:57 -0800 2014-02-12 20:19:38 -0800 Patch bug-128641-20140212125056.patch text/plain 5633 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYzOTQ0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBA CisyMDE0LTAyLTExICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgRGVsYXllZFJlbGVhc2VTY29wZSBpbiBNYXJrZWRBbGxvY2F0b3I6OnRyeUFsbG9j YXRlSGVscGVyIGlzIHdyb25nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjg2NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBXZSB3ZXJlIGltcHJvcGVybHkgaGFuZGxpbmcgdGhlIGNhc2Ugd2hlcmUgdGhl IERlbGF5ZWRSZWxlYXNlU2NvcGUgCisgICAgICAgIGluIHRyeUFsbG9jYXRlSGVscGVyIHdvdWxk IGNhdXNlIHVzIHRvIGRyb3AgdGhlIEFQSSBsb2NrLCBhbGxvd2luZyAKKyAgICAgICAgYW5vdGhl ciB0aHJlYWQgdG8gc25lYWsgaW4gYW5kIGFsbG9jYXRlIGEgbmV3IGJsb2NrIGFmdGVyIHdlIGhh ZCBhbHJlYWR5IAorICAgICAgICBjb25jbHVkZWQgdGhhdCB0aGVyZSB3ZXJlIG5vIG1vcmUgYmxv Y2tzIHRvIGFsbG9jYXRlIG91dCBvZi4KKworICAgICAgICBUaGUgZml4IGlzIHRvIGNhbGwgdHJ5 QWxsb2NhdGVIZWxwZXIgaW4gYSBsb29wIHVudGlsIHdlIGtub3cgZm9yIHN1cmUgCisgICAgICAg IHRoYXQgdGhpcyBkaWQgbm90IGhhcHBlbi4KKworICAgICAgICBUaGVyZSB3YXMgYWxzbyBhIHJh Y2UgY29uZGl0aW9uIHdpdGggdGhlIERlbGF5ZWRSZWxlYXNlU2NvcGUgaW4gYWRkQmxvY2suCisg ICAgICAgIFdlIHdvdWxkIGFkZCB0aGUgYmxvY2sgdG8gdGhlIE1hcmtlZEJsb2NrJ3MgbGlzdCwg c3dlZXAgaXQsIGFuZCB0aGVuIHJldHVybiwKKyAgICAgICAgY2F1c2luZyB1cyB0byBkcm9wIHRo ZSBBUEkgbG9jayBtb21lbnRhcmlseS4gQW5vdGhlciB0aHJlYWQgY291bGQgdGhlbiAKKyAgICAg ICAgZ3JhYiB0aGUgbG9jaywgYW5kIGFsbG9jYXRlIG91dCBvZiB0aGUgbmV3IGJsb2NrIHRvIHRo ZSBwb2ludCB3aGVyZSB0aGUgCisgICAgICAgIGZyZWUgbGlzdCB3YXMgZW1wdHkuIFRoZW4gd2Ug d291bGQgcmV0dXJuIHRvIHRoZSBvcmlnaW5hbCB0aHJlYWQsIHdobyB0aGlua3MgCisgICAgICAg IGl0J3MgaW1wb3NzaWJsZSB0byBub3QgYWxsb2NhdGUgc3VjY2Vzc2Z1bGx5IGF0IHRoaXMgcG9p bnQuIAorICAgICAgICBJbnN0ZWFkIHdlIHNob3VsZCBqdXN0IGxldCB0cnlBbGxvY2F0ZSBkbyBh bGwgdGhlIGhhcmQgd29yayB3aXRoIGNvcnJlY3RseSAKKyAgICAgICAgc3dlZXBpbmcgYW5kIGdl dHRpbmcgYSB2YWxpZCByZXN1bHQuCisKKyAgICAgICAgVGhlcmUgd2FzIGFub3RoZXIgcmFjZSBj b25kaXRpb24gaW4gZGlkRmluaXNoSXRlcmF0aW5nLiBXZSB3b3VsZCBjYWxsIHJlc3VtZUFsbG9j YXRpbmcsCisgICAgICAgIHdoaWNoIHdvdWxkIGNyZWF0ZSBhIERlbGF5ZWRSZWxlYXNlU2NvcGUu IFRoZSBEZWxheWVkUmVsZWFzZVNjb3BlIHdvdWxkIHRoZW4gcmVsZWFzZSAKKyAgICAgICAgQVBJ IGxvY2sgYmVmb3JlIHdlIHNldCBtX2lzSXRlcmF0aW5nIGJhY2sgdG8gZmFsc2UsIHdoaWNoIHdv dWxkIHBvdGVudGlhbGx5IGNvbmZ1c2UgCisgICAgICAgIG90aGVyIHRocmVhZHMuCisKKyAgICAg ICAgKiBoZWFwL01hcmtlZEFsbG9jYXRvci5jcHA6CisgICAgICAgIChKU0M6Ok1hcmtlZEFsbG9j YXRvcjo6dHJ5QWxsb2NhdGVIZWxwZXIpOgorICAgICAgICAoSlNDOjpNYXJrZWRBbGxvY2F0b3I6 OnRyeVBvcEZyZWVMaXN0KToKKyAgICAgICAgKEpTQzo6TWFya2VkQWxsb2NhdG9yOjp0cnlBbGxv Y2F0ZSk6CisgICAgICAgIChKU0M6Ok1hcmtlZEFsbG9jYXRvcjo6YWRkQmxvY2spOgorICAgICAg ICAqIGhlYXAvTWFya2VkQWxsb2NhdG9yLmg6CisKIDIwMTQtMDItMTEgIEZpbGlwIFBpemxvICA8 ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggYXNzZXJ0aW9ucyBhbmQgaW5jb3JyZWN0 IGNvZGVnZW4gZm9yIENvbXBhcmVFcShPYmplY3RPck90aGVyOiwgT2JqZWN0OikKSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEFsbG9jYXRvci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTWFya2VkQWxsb2NhdG9yLmNwcAkocmV2aXNp b24gMTYzOTEwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTWFya2VkQWxsb2NhdG9y LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA1LDE5ICsxMDUsNDIgQEAgaW5saW5lIHZvaWQqIE1h cmtlZEFsbG9jYXRvcjo6dHJ5QWxsb2NhdAogICAgIH0KIAogICAgIEFTU0VSVChtX2ZyZWVMaXN0 LmhlYWQpOwotICAgIE1hcmtlZEJsb2NrOjpGcmVlQ2VsbCogaGVhZCA9IG1fZnJlZUxpc3QuaGVh ZDsKLSAgICBtX2ZyZWVMaXN0LmhlYWQgPSBoZWFkLT5uZXh0OworICAgIHZvaWQqIGhlYWQgPSB0 cnlQb3BGcmVlTGlzdChieXRlcyk7CiAgICAgQVNTRVJUKGhlYWQpOwogICAgIG1fbWFya2VkU3Bh Y2UtPmRpZEFsbG9jYXRlSW5CbG9jayhtX2N1cnJlbnRCbG9jayk7CiAgICAgcmV0dXJuIGhlYWQ7 CiB9Ci0gICAgCisKK2lubGluZSB2b2lkKiBNYXJrZWRBbGxvY2F0b3I6OnRyeVBvcEZyZWVMaXN0 KHNpemVfdCBieXRlcykKK3sKKyAgICBBU1NFUlQobV9jdXJyZW50QmxvY2spOworICAgIGlmIChi eXRlcyA+IG1fY3VycmVudEJsb2NrLT5jZWxsU2l6ZSgpKQorICAgICAgICByZXR1cm4gMDsKKwor ICAgIE1hcmtlZEJsb2NrOjpGcmVlQ2VsbCogaGVhZCA9IG1fZnJlZUxpc3QuaGVhZDsKKyAgICBt X2ZyZWVMaXN0LmhlYWQgPSBoZWFkLT5uZXh0OworICAgIHJldHVybiBoZWFkOworfQorCiBpbmxp bmUgdm9pZCogTWFya2VkQWxsb2NhdG9yOjp0cnlBbGxvY2F0ZShzaXplX3QgYnl0ZXMpCiB7CiAg ICAgQVNTRVJUKCFtX2hlYXAtPmlzQnVzeSgpKTsKICAgICBtX2hlYXAtPm1fb3BlcmF0aW9uSW5Q cm9ncmVzcyA9IEFsbG9jYXRpb247CiAgICAgdm9pZCogcmVzdWx0ID0gdHJ5QWxsb2NhdGVIZWxw ZXIoYnl0ZXMpOworCisgICAgLy8gRHVlIHRvIHRoZSBEZWxheWVkUmVsZWFzZVNjb3BlIGluIHRy eUFsbG9jYXRlSGVscGVyLCBzb21lIG90aGVyIHRocmVhZCBtaWdodCBoYXZlCisgICAgLy8gY3Jl YXRlZCBhIG5ldyBibG9jayBhZnRlciB3ZSB0aG91Z2h0IHdlIGRpZG4ndCBmaW5kIGFueSBmcmVl IGNlbGxzLiAKKyAgICB3aGlsZSAoIXJlc3VsdCAmJiBtX2N1cnJlbnRCbG9jaykgeworICAgICAg ICAvLyBBIG5ldyBibG9jayB3YXMgYWRkZWQgYnkgYW5vdGhlciB0aHJlYWQgc28gdHJ5IHBvcHBp bmcgdGhlIGZyZWUgbGlzdC4KKyAgICAgICAgcmVzdWx0ID0gdHJ5UG9wRnJlZUxpc3QoYnl0ZXMp OworICAgICAgICBpZiAocmVzdWx0KQorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIC8vIFRo ZSBmcmVlIGxpc3Qgd2FzIGVtcHR5LCBzbyBjYWxsIHRyeUFsbG9jYXRlSGVscGVyIHRvIGRvIHRo ZSBub3JtYWwgc3dlZXBpbmcgc3R1ZmYuCisgICAgICAgIHJlc3VsdCA9IHRyeUFsbG9jYXRlSGVs cGVyKGJ5dGVzKTsKKyAgICB9CisKICAgICBtX2hlYXAtPm1fb3BlcmF0aW9uSW5Qcm9ncmVzcyA9 IE5vT3BlcmF0aW9uOworICAgIEFTU0VSVChyZXN1bHQgfHwgIW1fY3VycmVudEJsb2NrKTsKICAg ICByZXR1cm4gcmVzdWx0OwogfQogICAgIApAQCAtMTcxLDE0ICsxOTQsMTEgQEAgTWFya2VkQmxv Y2sqIE1hcmtlZEFsbG9jYXRvcjo6YWxsb2NhdGVCbAogCiB2b2lkIE1hcmtlZEFsbG9jYXRvcjo6 YWRkQmxvY2soTWFya2VkQmxvY2sqIGJsb2NrKQogewotICAgIC8vIFNhdGlzZnkgdGhlIEFTU0VS VCBpbiBNYXJrZWRCbG9jazo6c3dlZXAuCi0gICAgRGVsYXllZFJlbGVhc2VTY29wZSBkZWxheWVk UmVsZWFzZVNjb3BlKCptX21hcmtlZFNwYWNlKTsKICAgICBBU1NFUlQoIW1fY3VycmVudEJsb2Nr KTsKICAgICBBU1NFUlQoIW1fZnJlZUxpc3QuaGVhZCk7CiAgICAgCiAgICAgbV9ibG9ja0xpc3Qu YXBwZW5kKGJsb2NrKTsKLSAgICBtX25leHRCbG9ja1RvU3dlZXAgPSBtX2N1cnJlbnRCbG9jayA9 IGJsb2NrOwotICAgIG1fZnJlZUxpc3QgPSBibG9jay0+c3dlZXAoTWFya2VkQmxvY2s6OlN3ZWVw VG9GcmVlTGlzdCk7CisgICAgbV9uZXh0QmxvY2tUb1N3ZWVwID0gYmxvY2s7CiAgICAgbV9tYXJr ZWRTcGFjZS0+ZGlkQWRkQmxvY2soYmxvY2spOwogfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaGVhcC9NYXJrZWRBbGxvY2F0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvaGVhcC9NYXJrZWRBbGxvY2F0b3IuaAkocmV2aXNpb24gMTYzOTEwKQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTWFya2VkQWxsb2NhdG9yLmgJKHdvcmtpbmcgY29weSkK QEAgLTQ3LDYgKzQ3LDcgQEAgcHJpdmF0ZToKICAgICBKU19FWFBPUlRfUFJJVkFURSB2b2lkKiBh bGxvY2F0ZVNsb3dDYXNlKHNpemVfdCk7CiAgICAgdm9pZCogdHJ5QWxsb2NhdGUoc2l6ZV90KTsK ICAgICB2b2lkKiB0cnlBbGxvY2F0ZUhlbHBlcihzaXplX3QpOworICAgIHZvaWQqIHRyeVBvcEZy ZWVMaXN0KHNpemVfdCk7CiAgICAgTWFya2VkQmxvY2sqIGFsbG9jYXRlQmxvY2soc2l6ZV90KTsK ICAgICAKICAgICBNYXJrZWRCbG9jazo6RnJlZUxpc3QgbV9mcmVlTGlzdDsKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZFNwYWNlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRTcGFjZS5jcHAJKHJldmlzaW9uIDE2MzkxMCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZFNwYWNlLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjEzLDcgKzIxMyw2IEBAIHN0cnVjdCBSZXN1bWVBbGxvY2F0aW5nRnVuY3RvciB7 CiB2b2lkIE1hcmtlZFNwYWNlOjpyZXN1bWVBbGxvY2F0aW5nKCkKIHsKICAgICBBU1NFUlQoaXNJ dGVyYXRpbmcoKSk7Ci0gICAgRGVsYXllZFJlbGVhc2VTY29wZSBzY29wZSgqdGhpcyk7CiAgICAg Zm9yRWFjaEFsbG9jYXRvcjxSZXN1bWVBbGxvY2F0aW5nRnVuY3Rvcj4oKTsKIH0KIApAQCAtMzQ2 LDYgKzM0NSw3IEBAIHZvaWQgTWFya2VkU3BhY2U6OndpbGxTdGFydEl0ZXJhdGluZygpCiB2b2lk IE1hcmtlZFNwYWNlOjpkaWRGaW5pc2hJdGVyYXRpbmcoKQogewogICAgIEFTU0VSVChpc0l0ZXJh dGluZygpKTsKKyAgICBEZWxheWVkUmVsZWFzZVNjb3BlIHNjb3BlKCp0aGlzKTsKICAgICByZXN1 bWVBbGxvY2F0aW5nKCk7CiAgICAgbV9pc0l0ZXJhdGluZyA9IGZhbHNlOwogfQo=