183925 2018-03-22 17:14:11 -0700 CacheStorage::Engine should not ref itself when hopping to a background thread 2018-03-23 11:02:36 -0700 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen cdumez cgarcia commit-queue ews-watchlist koivisto webkit-bug-importer oldest_to_newest 1408566 0 youennf 2018-03-22 17:14:11 -0700 Instead we can use a weakThis 1408567 1 youennf 2018-03-22 17:14:36 -0700 <rdar://problem/38580483> 1408568 2 336340 youennf 2018-03-22 17:18:05 -0700 Created attachment 336340 Patch 1408691 3 336370 youennf 2018-03-23 07:54:47 -0700 Created attachment 336370 Patch 1408712 4 336370 cdumez 2018-03-23 08:47:58 -0700 Comment on attachment 336370 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=336370&action=review r=me with comments > Source/WebKit/ChangeLog:10 > + Use weak pointer when hopping ot background threads. typo: ot > Source/WebKit/ChangeLog:14 > + Made sure to use just oen Engine for all private sessions. typo: oen > Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp:330 > + RunLoop::main().dispatch([this, weakThis = makeWeakPtr(this), identifier]() mutable { I do not think we should be calling makeWeakPtr() from a background thread. I doubt it is thread safe (In particular, createWeakPtr() that is being implicitly called). I'd suggest WTFMove() ing weakThis here. 1408744 5 336385 youennf 2018-03-23 10:09:27 -0700 Created attachment 336385 Patch 1408745 6 youennf 2018-03-23 10:09:59 -0700 (In reply to youenn fablet from comment #5) > Created attachment 336385 [details] > Patch Thanks for the review. Fixed the issues in this patch. 1408767 7 336385 commit-queue 2018-03-23 11:02:34 -0700 Comment on attachment 336385 Patch Clearing flags on attachment: 336385 Committed r229904: <https://trac.webkit.org/changeset/229904> 1408768 8 commit-queue 2018-03-23 11:02:36 -0700 All reviewed patches have been landed. Closing bug. 336340 2018-03-22 17:18:05 -0700 2018-03-23 07:54:46 -0700 Patch bug-183925-20180322171804.patch text/plain 10067 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5ODU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ0NzJlNjIxMWZlYTVlNTJm MDhkNzczZGZmMWE5Yjk3NGZjMzc2YTYuLjgzYzk0MWNjMmNhOTNlNDk3ZmI5NTgxZTczMTRiNGZh N2VhNmQ3MGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTgtMDMtMjIgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIENhY2hlU3RvcmFnZTo6RW5naW5l IHNob3VsZCBub3QgcmVmIGl0c2VsZiB3aGVuIGhvcHBpbmcgdG8gYSBiYWNrZ3JvdW5kIHRocmVh ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzOTI1 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zODU4MDQ4Mz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3Igd2VhayBwb2ludGVy cyB0byBDYWNoZVN0b3JhZ2UgRW5naW5lLgorICAgICAgICBVc2Ugd2VhayBwb2ludGVyIHdoZW4g aG9wcGluZyBvdCBiYWNrZ3JvdW5kIHRocmVhZHMuCisgICAgICAgIFN0b3JlIGNhbGxiYWNrcyBp biBDYWNoZVN0b3JhZ2U6OkVuZ2luZSBtYXBzIHRvIGtlZXAgdGhlbSBiZWluZyBkZXN0cm95ZWQg aW4gdGhlIG1haW4gdGhyZWFkIG9ubHkuCisgICAgICAgIE1hZGUgc29tZSBjYWxsYmFja3MgQ29t cGxldGlvbkhhbmRsZXIgYXMgYSBib251cy4KKworICAgICAgICBNYWRlIHN1cmUgdG8gdXNlIGp1 c3Qgb2VuIEVuZ2luZSBmb3IgYWxsIHByaXZhdGUgc2Vzc2lvbnMuCisKKyAgICAgICAgKiBOZXR3 b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3BwOgorICAgICAgICAoV2ViS2l0 OjpDYWNoZVN0b3JhZ2U6OkVuZ2luZTo6fkVuZ2luZSk6CisgICAgICAgIChXZWJLaXQ6OkNhY2hl U3RvcmFnZTo6RW5naW5lOjpmcm9tKToKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpF bmdpbmU6OmluaXRpYWxpemUpOgorICAgICAgICAoV2ViS2l0OjpDYWNoZVN0b3JhZ2U6OkVuZ2lu ZTo6d3JpdGVGaWxlKToKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpFbmdpbmU6OnJl YWRGaWxlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdp bmUuaDoKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpFbmdpbmU6OndlYWtQdHJGYWN0 b3J5KToKKwogMjAxOC0wMy0yMiAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW1RleE1hcF0gTWFrZSBUZXh0dXJlTWFwcGVyQ29udGV4dEF0dHJpYnV0ZXMg dGhyZWFkLXNwZWNpZmljCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5jcHAKaW5kZXggMmMxMDVjNDRjYzlhNTk1NjEy MjY5MGJmMjBkZmNjNWJiMDRkZTEyMC4uMzQyYWMwY2Y4OTMxYzVlNTZmMTE1ZWMwZDkxZmZiYjFh YWNiZmQ0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9D YWNoZVN0b3JhZ2VFbmdpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmNwcApAQCAtNjYsMTAgKzY2LDI0IEBAIEVuZ2luZTo6 fkVuZ2luZSgpCiB7CiAgICAgZm9yIChhdXRvJiBjYWNoZXMgOiBtX2NhY2hlcy52YWx1ZXMoKSkK ICAgICAgICAgY2FjaGVzLT5kZXRhY2goKTsKKworICAgIGlmIChtX2luaXRpYWxpemF0aW9uQ2Fs bGJhY2spCisgICAgICAgIG1faW5pdGlhbGl6YXRpb25DYWxsYmFjayhFcnJvcjo6SW50ZXJuYWwp OworCisgICAgYXV0byB3cml0ZUNhbGxiYWNrcyA9IFdURk1vdmUobV9wZW5kaW5nV3JpdGVDYWxs YmFja3MpOworICAgIGZvciAoYXV0byYgY2FsbGJhY2sgOiB3cml0ZUNhbGxiYWNrcy52YWx1ZXMo KSkKKyAgICAgICAgY2FsbGJhY2soRXJyb3I6OkludGVybmFsKTsKKworICAgIGF1dG8gcmVhZENh bGxiYWNrcyA9IFdURk1vdmUobV9wZW5kaW5nUmVhZENhbGxiYWNrcyk7CisgICAgZm9yIChhdXRv JiBjYWxsYmFjayA6IHJlYWRDYWxsYmFja3MudmFsdWVzKCkpCisgICAgICAgIGNhbGxiYWNrKERh dGEgeyB9LCAxKTsKIH0KIAogRW5naW5lJiBFbmdpbmU6OmZyb20oUEFMOjpTZXNzaW9uSUQgc2Vz c2lvbklEKQogeworICAgIGlmIChzZXNzaW9uSUQuaXNFcGhlbWVyYWwoKSkKKyAgICAgICAgc2Vz c2lvbklEID0gUEFMOjpTZXNzaW9uSUQ6OmxlZ2FjeVByaXZhdGVTZXNzaW9uSUQoKTsKKwogICAg IGF1dG8gYWRkUmVzdWx0ID0gZ2xvYmFsRW5naW5lTWFwKCkuYWRkKHNlc3Npb25JRCwgbnVsbHB0 cik7CiAgICAgaWYgKGFkZFJlc3VsdC5pc05ld0VudHJ5KQogICAgICAgICBhZGRSZXN1bHQuaXRl cmF0b3ItPnZhbHVlID0gRW5naW5lOjpjcmVhdGUoTmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbigp LmNhY2hlU3RvcmFnZURpcmVjdG9yeShzZXNzaW9uSUQpKTsKQEAgLTE3OCw3ICsxOTIsNyBAQCB2 b2lkIEVuZ2luZTo6ZGVsZXRlTWF0Y2hpbmdSZWNvcmRzKHVpbnQ2NF90IGNhY2hlSWRlbnRpZmll ciwgV2ViQ29yZTo6UmVzb3VyY2VSZQogICAgIH0pOwogfQogCi12b2lkIEVuZ2luZTo6aW5pdGlh bGl6ZShGdW5jdGlvbjx2b2lkKHN0ZDo6b3B0aW9uYWw8RXJyb3I+JiYpPiYmIGNhbGxiYWNrKQor dm9pZCBFbmdpbmU6OmluaXRpYWxpemUoQ29tcGxldGlvbkNhbGxiYWNrJiYgY2FsbGJhY2spCiB7 CiAgICAgaWYgKG1fc2FsdCkgewogICAgICAgICBjYWxsYmFjayhzdGQ6Om51bGxvcHQpOwpAQCAt MTkwLDE2ICsyMDQsMjEgQEAgdm9pZCBFbmdpbmU6OmluaXRpYWxpemUoRnVuY3Rpb248dm9pZChz dGQ6Om9wdGlvbmFsPEVycm9yPiYmKT4mJiBjYWxsYmFjaykKICAgICAgICAgcmV0dXJuOwogICAg IH0KIAorICAgIG1faW5pdGlhbGl6YXRpb25DYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spOwor CiAgICAgU3RyaW5nIHNhbHRQYXRoID0gV2ViQ29yZTo6RmlsZVN5c3RlbTo6cGF0aEJ5QXBwZW5k aW5nQ29tcG9uZW50KG1fcm9vdFBhdGgsIEFTQ0lJTGl0ZXJhbCgic2FsdCIpKTsKLSAgICBtX2lv UXVldWUtPmRpc3BhdGNoKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHRoaXMsIGNh bGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIHNhbHRQYXRoID0gV1RGTW92ZShzYWx0UGF0aCld ICgpIG11dGFibGUgeworICAgIG1faW9RdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHdlYWtUaGlzID0g bWFrZVdlYWtQdHIodGhpcyksIHNhbHRQYXRoID0gV1RGTW92ZShzYWx0UGF0aCldICgpIG11dGFi bGUgewogICAgICAgICBXZWJDb3JlOjpGaWxlU3lzdGVtOjptYWtlQWxsRGlyZWN0b3JpZXMobV9y b290UGF0aCk7Ci0gICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbcHJvdGVjdGVkVGhp cyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIHRoaXMsIHNhbHQgPSByZWFkT3JNYWtlU2FsdChz YWx0UGF0aCksIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKCkgbXV0YWJsZSB7CisgICAg ICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0 cih0aGlzKSwgc2FsdCA9IHJlYWRPck1ha2VTYWx0KHNhbHRQYXRoKV0oKSBtdXRhYmxlIHsKKyAg ICAgICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCiAgICAg ICAgICAgICBpZiAoIXNhbHQpIHsKLSAgICAgICAgICAgICAgICBjYWxsYmFjayhFcnJvcjo6V3Jp dGVEaXNrKTsKKyAgICAgICAgICAgICAgICBtX2luaXRpYWxpemF0aW9uQ2FsbGJhY2soRXJyb3I6 OldyaXRlRGlzayk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogICAg ICAgICAgICAgbV9zYWx0ID0gV1RGTW92ZShzYWx0KTsKLSAgICAgICAgICAgIGNhbGxiYWNrKHN0 ZDo6bnVsbG9wdCk7CisgICAgICAgICAgICBtX2luaXRpYWxpemF0aW9uQ2FsbGJhY2soc3RkOjpu dWxsb3B0KTsKICAgICAgICAgfSk7CiAgICAgfSk7CiB9CkBAIC0yNzcsMTAgKzI5NiwxNSBAQCB2 b2lkIEVuZ2luZTo6d3JpdGVGaWxlKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUsIE5ldHdvcmtDYWNo ZTo6RGF0YSYmIGRhdGEsIFdlYkNvcgogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgbV9p b1F1ZXVlLT5kaXNwYXRjaChbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgZGF0YSA9IFdU Rk1vdmUoZGF0YSksIGZpbGVuYW1lID0gZmlsZW5hbWUuaXNvbGF0ZWRDb3B5KCldICgpIG11dGFi bGUgeworICAgIG1fcGVuZGluZ1dyaXRlQ2FsbGJhY2tzLmFkZCgrK21fcGVuZGluZ0NhbGxiYWNr c0NvdW50ZXIsIFdURk1vdmUoY2FsbGJhY2spKTsKKyAgICBtX2lvUXVldWUtPmRpc3BhdGNoKFt0 aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKHRoaXMpLCBpZGVudGlmaWVyID0gbV9wZW5kaW5n Q2FsbGJhY2tzQ291bnRlciwgZGF0YSA9IFdURk1vdmUoZGF0YSksIGZpbGVuYW1lID0gZmlsZW5h bWUuaXNvbGF0ZWRDb3B5KCldICgpIG11dGFibGUgewogICAgICAgICBhdXRvIGNoYW5uZWwgPSBJ T0NoYW5uZWw6Om9wZW4oZmlsZW5hbWUsIElPQ2hhbm5lbDo6VHlwZTo6Q3JlYXRlKTsKLSAgICAg ICAgY2hhbm5lbC0+d3JpdGUoMCwgZGF0YSwgbnVsbHB0ciwgW2NhbGxiYWNrID0gV1RGTW92ZShj YWxsYmFjayldKGludCBlcnJvcikgbXV0YWJsZSB7CisgICAgICAgIGNoYW5uZWwtPndyaXRlKDAs IGRhdGEsIG51bGxwdHIsIFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKHRoaXMpLCBpZGVu dGlmaWVyXShpbnQgZXJyb3IpIG11dGFibGUgewogICAgICAgICAgICAgQVNTRVJUKFJ1bkxvb3A6 OmlzTWFpbigpKTsKKyAgICAgICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICAgICAg cmV0dXJuOworCisgICAgICAgICAgICBhdXRvIGNhbGxiYWNrID0gbV9wZW5kaW5nV3JpdGVDYWxs YmFja3MudGFrZShpZGVudGlmaWVyKTsKICAgICAgICAgICAgIGlmIChlcnJvcikgewogICAgICAg ICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKENhY2hlU3RvcmFnZSwgIkNhY2hlU3RvcmFnZTo6 RW5naW5lOjp3cml0ZUZpbGUgZmFpbGVkIHdpdGggZXJyb3IgJWQiLCBlcnJvcik7CiAKQEAgLTI5 MiwyOCArMzE2LDM2IEBAIHZvaWQgRW5naW5lOjp3cml0ZUZpbGUoY29uc3QgU3RyaW5nJiBmaWxl bmFtZSwgTmV0d29ya0NhY2hlOjpEYXRhJiYgZGF0YSwgV2ViQ29yCiAgICAgfSk7CiB9CiAKLXZv aWQgRW5naW5lOjpyZWFkRmlsZShjb25zdCBTdHJpbmcmIGZpbGVuYW1lLCBXVEY6OkZ1bmN0aW9u PHZvaWQoY29uc3QgTmV0d29ya0NhY2hlOjpEYXRhJiwgaW50IGVycm9yKT4mJiBjYWxsYmFjaykK K3ZvaWQgRW5naW5lOjpyZWFkRmlsZShjb25zdCBTdHJpbmcmIGZpbGVuYW1lLCBDb21wbGV0aW9u SGFuZGxlcjx2b2lkKGNvbnN0IE5ldHdvcmtDYWNoZTo6RGF0YSYsIGludCBlcnJvcik+JiYgY2Fs bGJhY2spCiB7CiAgICAgaWYgKCFzaG91bGRQZXJzaXN0KCkpIHsKICAgICAgICAgY2FsbGJhY2so RGF0YSB7IH0sIDApOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgbV9pb1F1ZXVlLT5k aXNwYXRjaChbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgZmlsZW5hbWUgPSBmaWxlbmFt ZS5pc29sYXRlZENvcHkoKV0oKSBtdXRhYmxlIHsKKyAgICBtX3BlbmRpbmdSZWFkQ2FsbGJhY2tz LmFkZCgrK21fcGVuZGluZ0NhbGxiYWNrc0NvdW50ZXIsIFdURk1vdmUoY2FsbGJhY2spKTsKKyAg ICBtX2lvUXVldWUtPmRpc3BhdGNoKFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKHRoaXMp LCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBpZGVudGlmaWVyID0gbV9wZW5kaW5nQ2Fs bGJhY2tzQ291bnRlciwgZmlsZW5hbWUgPSBmaWxlbmFtZS5pc29sYXRlZENvcHkoKV0oKSBtdXRh YmxlIHsKICAgICAgICAgYXV0byBjaGFubmVsID0gSU9DaGFubmVsOjpvcGVuKGZpbGVuYW1lLCBJ T0NoYW5uZWw6OlR5cGU6OlJlYWQpOwogICAgICAgICBpZiAoY2hhbm5lbC0+ZmlsZURlc2NyaXB0 b3IoKSA8IDApIHsKLSAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbY2FsbGJh Y2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oKSBtdXRhYmxlIHsKLSAgICAgICAgICAgICAgICBjYWxs YmFjayhEYXRhIHsgfSwgMCk7CisgICAgICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2go W3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIodGhpcyksIGlkZW50aWZpZXJdKCkgbXV0YWJs ZSB7CisgICAgICAgICAgICAgICAgaWYgKCF3ZWFrVGhpcykKKyAgICAgICAgICAgICAgICAgICAg cmV0dXJuOworCisgICAgICAgICAgICAgICAgbV9wZW5kaW5nUmVhZENhbGxiYWNrcy50YWtlKGlk ZW50aWZpZXIpKERhdGEgeyB9LCAwKTsKICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgY2hhbm5lbC0+cmVhZCgwLCBzdGQ6Om51bWVyaWNf bGltaXRzPHNpemVfdD46Om1heCgpLCBudWxscHRyLCBbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxi YWNrKV0oY29uc3QgRGF0YSYgZGF0YSwgaW50IGVycm9yKSBtdXRhYmxlIHsKKyAgICAgICAgY2hh bm5lbC0+cmVhZCgwLCBzdGQ6Om51bWVyaWNfbGltaXRzPHNpemVfdD46Om1heCgpLCBudWxscHRy LCBbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cih0aGlzKSwgaWRlbnRpZmllcl0oY29uc3Qg RGF0YSYgZGF0YSwgaW50IGVycm9yKSBtdXRhYmxlIHsKICAgICAgICAgICAgIFJFTEVBU0VfTE9H X0VSUk9SX0lGKGVycm9yLCBDYWNoZVN0b3JhZ2UsICJDYWNoZVN0b3JhZ2U6OkVuZ2luZTo6cmVh ZEZpbGUgZmFpbGVkIHdpdGggZXJyb3IgJWQiLCBlcnJvcik7CiAKICAgICAgICAgICAgIC8vIEZJ WE1FOiBXZSBzaG91bGQgZG8gdGhlIGRlY29kaW5nIGluIHRoZSBiYWNrZ3JvdW5kIHRocmVhZC4K ICAgICAgICAgICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7Ci0gICAgICAgICAgICBjYWxs YmFjayhkYXRhLCBlcnJvcik7CisKKyAgICAgICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAg ICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICBtX3BlbmRpbmdSZWFkQ2FsbGJhY2tzLnRh a2UoaWRlbnRpZmllcikoZGF0YSwgZXJyb3IpOwogICAgICAgICB9KTsKICAgICB9KTsKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdl RW5naW5lLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFn ZUVuZ2luZS5oCmluZGV4IDA3NWVlZTVmY2QzOTk5OGEzZTQxOTRiZjExM2JiMzY0MzI4YzY5MDQu LmQ3ZTVlZjc3NmI1MGYxOTdmMDUyNzc3Mjk4OTkxODU3NzE4ZDkxMjMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmgKKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUu aApAQCAtMzAsNyArMzAsOCBAQAogI2luY2x1ZGUgIldlYnNpdGVEYXRhLmgiCiAjaW5jbHVkZSA8 V2ViQ29yZS9DbGllbnRPcmlnaW4uaD4KICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgotI2luY2x1 ZGUgPHd0Zi9UaHJlYWRTYWZlUmVmQ291bnRlZC5oPgorI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVk Lmg+CisjaW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KICNpbmNsdWRlIDx3dGYvV29ya1F1ZXVlLmg+ CiAKIG5hbWVzcGFjZSBJUEMgewpAQCAtNTIsNyArNTMsNyBAQCBuYW1lc3BhY2UgQ2FjaGVTdG9y YWdlIHsKIHVzaW5nIENhY2hlSWRlbnRpZmllciA9IHVpbnQ2NF90OwogdXNpbmcgTG9ja0NvdW50 ID0gdWludDY0X3Q7CiAKLWNsYXNzIEVuZ2luZSA6IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRl ZDxFbmdpbmU+IHsKK2NsYXNzIEVuZ2luZSA6IHB1YmxpYyBSZWZDb3VudGVkPEVuZ2luZT4gewog cHVibGljOgogICAgIH5FbmdpbmUoKTsKIApAQCAtNzYsNyArNzcsNyBAQCBwdWJsaWM6CiAgICAg dm9pZCB1bmxvY2sodWludDY0X3QgY2FjaGVJZGVudGlmaWVyKTsKIAogICAgIHZvaWQgd3JpdGVG aWxlKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUsIE5ldHdvcmtDYWNoZTo6RGF0YSYmLCBXZWJDb3Jl OjpET01DYWNoZUVuZ2luZTo6Q29tcGxldGlvbkNhbGxiYWNrJiYpOwotICAgIHZvaWQgcmVhZEZp bGUoY29uc3QgU3RyaW5nJiBmaWxlbmFtZSwgV1RGOjpGdW5jdGlvbjx2b2lkKGNvbnN0IE5ldHdv cmtDYWNoZTo6RGF0YSYsIGludCBlcnJvcik+JiYpOworICAgIHZvaWQgcmVhZEZpbGUoY29uc3Qg U3RyaW5nJiBmaWxlbmFtZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBOZXR3b3JrQ2Fj aGU6OkRhdGEmLCBpbnQgZXJyb3IpPiYmKTsKICAgICB2b2lkIHJlbW92ZUZpbGUoY29uc3QgU3Ry aW5nJiBmaWxlbmFtZSk7CiAKICAgICBjb25zdCBTdHJpbmcmIHJvb3RQYXRoKCkgY29uc3QgeyBy ZXR1cm4gbV9yb290UGF0aDsgfQpAQCAtODksNiArOTAsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBj bGVhckFsbENhY2hlcyhXVEY6OkNhbGxiYWNrQWdncmVnYXRvciYpOwogICAgIHZvaWQgY2xlYXJD YWNoZXNGb3JPcmlnaW4oY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiwgV1RGOjpD YWxsYmFja0FnZ3JlZ2F0b3ImKTsKIAorICAgIFdlYWtQdHJGYWN0b3J5PEVuZ2luZT4mIHdlYWtQ dHJGYWN0b3J5KCkgeyByZXR1cm4gbV93ZWFrRmFjdG9yeTsgfQorCiBwcml2YXRlOgogICAgIHN0 YXRpYyBFbmdpbmUmIGRlZmF1bHRFbmdpbmUoKTsKICAgICBleHBsaWNpdCBFbmdpbmUoU3RyaW5n JiYgcm9vdFBhdGgpOwpAQCAtOTcsNyArMTAwLDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgZmV0 Y2hFbnRyaWVzKGJvb2wgLyogc2hvdWxkQ29tcHV0ZVNpemUgKi8sIFdURjo6Q29tcGxldGlvbkhh bmRsZXI8dm9pZChWZWN0b3I8V2Vic2l0ZURhdGE6OkVudHJ5Pik+JiYpOwogCi0gICAgdm9pZCBp bml0aWFsaXplKFdURjo6RnVuY3Rpb248dm9pZChzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OkRPTUNh Y2hlRW5naW5lOjpFcnJvcj4mJik+JiYpOworICAgIHZvaWQgaW5pdGlhbGl6ZShXZWJDb3JlOjpE T01DYWNoZUVuZ2luZTo6Q29tcGxldGlvbkNhbGxiYWNrJiYpOwogCiAgICAgdXNpbmcgQ2FjaGVz T3JFcnJvciA9IEV4cGVjdGVkPHN0ZDo6cmVmZXJlbmNlX3dyYXBwZXI8Q2FjaGVzPiwgV2ViQ29y ZTo6RE9NQ2FjaGVFbmdpbmU6OkVycm9yPjsKICAgICB1c2luZyBDYWNoZXNDYWxsYmFjayA9IFdU Rjo6RnVuY3Rpb248dm9pZChDYWNoZXNPckVycm9yJiYpPjsKQEAgLTExNSw2ICsxMTgsMTEgQEAg cHJpdmF0ZToKICAgICBSZWZQdHI8V29ya1F1ZXVlPiBtX2lvUXVldWU7CiAgICAgc3RkOjpvcHRp b25hbDxOZXR3b3JrQ2FjaGU6OlNhbHQ+IG1fc2FsdDsKICAgICBIYXNoTWFwPENhY2hlSWRlbnRp ZmllciwgTG9ja0NvdW50PiBtX2NhY2hlTG9ja3M7CisgICAgV2ViQ29yZTo6RE9NQ2FjaGVFbmdp bmU6OkNvbXBsZXRpb25DYWxsYmFjayBtX2luaXRpYWxpemF0aW9uQ2FsbGJhY2s7CisgICAgV2Vh a1B0ckZhY3Rvcnk8RW5naW5lPiBtX3dlYWtGYWN0b3J5OworICAgIEhhc2hNYXA8dWludDY0X3Qs IFdlYkNvcmU6OkRPTUNhY2hlRW5naW5lOjpDb21wbGV0aW9uQ2FsbGJhY2s+IG1fcGVuZGluZ1dy aXRlQ2FsbGJhY2tzOworICAgIEhhc2hNYXA8dWludDY0X3QsIENvbXBsZXRpb25IYW5kbGVyPHZv aWQoY29uc3QgTmV0d29ya0NhY2hlOjpEYXRhJiwgaW50IGVycm9yKT4+IG1fcGVuZGluZ1JlYWRD YWxsYmFja3M7CisgICAgdWludDY0X3QgbV9wZW5kaW5nQ2FsbGJhY2tzQ291bnRlciB7IDAgfTsK IH07CiAKIH0gLy8gbmFtZXNwYWNlIENhY2hlU3RvcmFnZQo= 336370 2018-03-23 07:54:47 -0700 2018-03-23 10:09:26 -0700 Patch bug-183925-20180323075445.patch text/plain 10030 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5ODc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRiNTVjYjFiZTY0YjRjZjhl NzFmZmFkZmU5OTQwZmJhMWFiNGIxMmIuLjEwMzcyMjZlMDVkZTI2NjgxZTdmM2VkNzE4MTQ3YWZh YWE1MTMwMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTgtMDMtMjIgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIENhY2hlU3RvcmFnZTo6RW5naW5l IHNob3VsZCBub3QgcmVmIGl0c2VsZiB3aGVuIGhvcHBpbmcgdG8gYSBiYWNrZ3JvdW5kIHRocmVh ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzOTI1 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zODU4MDQ4Mz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3Igd2VhayBwb2ludGVy cyB0byBDYWNoZVN0b3JhZ2UgRW5naW5lLgorICAgICAgICBVc2Ugd2VhayBwb2ludGVyIHdoZW4g aG9wcGluZyBvdCBiYWNrZ3JvdW5kIHRocmVhZHMuCisgICAgICAgIFN0b3JlIGNhbGxiYWNrcyBp biBDYWNoZVN0b3JhZ2U6OkVuZ2luZSBtYXBzIHRvIGtlZXAgdGhlbSBiZWluZyBkZXN0cm95ZWQg aW4gdGhlIG1haW4gdGhyZWFkIG9ubHkuCisgICAgICAgIE1hZGUgc29tZSBjYWxsYmFja3MgQ29t cGxldGlvbkhhbmRsZXIgYXMgYSBib251cy4KKworICAgICAgICBNYWRlIHN1cmUgdG8gdXNlIGp1 c3Qgb2VuIEVuZ2luZSBmb3IgYWxsIHByaXZhdGUgc2Vzc2lvbnMuCisKKyAgICAgICAgKiBOZXR3 b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3BwOgorICAgICAgICAoV2ViS2l0 OjpDYWNoZVN0b3JhZ2U6OkVuZ2luZTo6fkVuZ2luZSk6CisgICAgICAgIChXZWJLaXQ6OkNhY2hl U3RvcmFnZTo6RW5naW5lOjpmcm9tKToKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpF bmdpbmU6OmluaXRpYWxpemUpOgorICAgICAgICAoV2ViS2l0OjpDYWNoZVN0b3JhZ2U6OkVuZ2lu ZTo6d3JpdGVGaWxlKToKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpFbmdpbmU6OnJl YWRGaWxlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdp bmUuaDoKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpFbmdpbmU6OndlYWtQdHJGYWN0 b3J5KToKKwogMjAxOC0wMy0yMiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAg ICAgICAgIEluY2x1ZGUgc2VjdXJpdHkgb3JpZ2luIGluIHRoZSBzZXJ2aWNlIHdvcmtlciBwcm9j ZXNzIG5hbWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUv Q2FjaGVTdG9yYWdlRW5naW5lLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2Fj aGUvQ2FjaGVTdG9yYWdlRW5naW5lLmNwcAppbmRleCAyYzEwNWM0NGNjOWE1OTU2MTIyNjkwYmYy MGRmY2M1YmIwNGRlMTIwLi5iYzc5NzZjODQzNDkxNWQyMGNkOWMyNmQxNjlkZTFmMmQ0NTY1YzBm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3Rv cmFnZUVuZ2luZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9D YWNoZVN0b3JhZ2VFbmdpbmUuY3BwCkBAIC02NiwxMCArNjYsMjQgQEAgRW5naW5lOjp+RW5naW5l KCkKIHsKICAgICBmb3IgKGF1dG8mIGNhY2hlcyA6IG1fY2FjaGVzLnZhbHVlcygpKQogICAgICAg ICBjYWNoZXMtPmRldGFjaCgpOworCisgICAgaWYgKG1faW5pdGlhbGl6YXRpb25DYWxsYmFjaykK KyAgICAgICAgbV9pbml0aWFsaXphdGlvbkNhbGxiYWNrKEVycm9yOjpJbnRlcm5hbCk7CisKKyAg ICBhdXRvIHdyaXRlQ2FsbGJhY2tzID0gV1RGTW92ZShtX3BlbmRpbmdXcml0ZUNhbGxiYWNrcyk7 CisgICAgZm9yIChhdXRvJiBjYWxsYmFjayA6IHdyaXRlQ2FsbGJhY2tzLnZhbHVlcygpKQorICAg ICAgICBjYWxsYmFjayhFcnJvcjo6SW50ZXJuYWwpOworCisgICAgYXV0byByZWFkQ2FsbGJhY2tz ID0gV1RGTW92ZShtX3BlbmRpbmdSZWFkQ2FsbGJhY2tzKTsKKyAgICBmb3IgKGF1dG8mIGNhbGxi YWNrIDogcmVhZENhbGxiYWNrcy52YWx1ZXMoKSkKKyAgICAgICAgY2FsbGJhY2soRGF0YSB7IH0s IDEpOwogfQogCiBFbmdpbmUmIEVuZ2luZTo6ZnJvbShQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQp CiB7CisgICAgaWYgKHNlc3Npb25JRC5pc0VwaGVtZXJhbCgpKQorICAgICAgICBzZXNzaW9uSUQg PSBQQUw6OlNlc3Npb25JRDo6bGVnYWN5UHJpdmF0ZVNlc3Npb25JRCgpOworCiAgICAgYXV0byBh ZGRSZXN1bHQgPSBnbG9iYWxFbmdpbmVNYXAoKS5hZGQoc2Vzc2lvbklELCBudWxscHRyKTsKICAg ICBpZiAoYWRkUmVzdWx0LmlzTmV3RW50cnkpCiAgICAgICAgIGFkZFJlc3VsdC5pdGVyYXRvci0+ dmFsdWUgPSBFbmdpbmU6OmNyZWF0ZShOZXR3b3JrUHJvY2Vzczo6c2luZ2xldG9uKCkuY2FjaGVT dG9yYWdlRGlyZWN0b3J5KHNlc3Npb25JRCkpOwpAQCAtMTc4LDcgKzE5Miw3IEBAIHZvaWQgRW5n aW5lOjpkZWxldGVNYXRjaGluZ1JlY29yZHModWludDY0X3QgY2FjaGVJZGVudGlmaWVyLCBXZWJD b3JlOjpSZXNvdXJjZVJlCiAgICAgfSk7CiB9CiAKLXZvaWQgRW5naW5lOjppbml0aWFsaXplKEZ1 bmN0aW9uPHZvaWQoc3RkOjpvcHRpb25hbDxFcnJvcj4mJik+JiYgY2FsbGJhY2spCit2b2lkIEVu Z2luZTo6aW5pdGlhbGl6ZShDb21wbGV0aW9uQ2FsbGJhY2smJiBjYWxsYmFjaykKIHsKICAgICBp ZiAobV9zYWx0KSB7CiAgICAgICAgIGNhbGxiYWNrKHN0ZDo6bnVsbG9wdCk7CkBAIC0xOTAsMTYg KzIwNCwyMSBAQCB2b2lkIEVuZ2luZTo6aW5pdGlhbGl6ZShGdW5jdGlvbjx2b2lkKHN0ZDo6b3B0 aW9uYWw8RXJyb3I+JiYpPiYmIGNhbGxiYWNrKQogICAgICAgICByZXR1cm47CiAgICAgfQogCisg ICAgbV9pbml0aWFsaXphdGlvbkNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayk7CisKICAgICBT dHJpbmcgc2FsdFBhdGggPSBXZWJDb3JlOjpGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21w b25lbnQobV9yb290UGF0aCwgQVNDSUlMaXRlcmFsKCJzYWx0IikpOwotICAgIG1faW9RdWV1ZS0+ ZGlzcGF0Y2goW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgdGhpcywgY2FsbGJhY2sg PSBXVEZNb3ZlKGNhbGxiYWNrKSwgc2FsdFBhdGggPSBXVEZNb3ZlKHNhbHRQYXRoKV0gKCkgbXV0 YWJsZSB7CisgICAgbV9pb1F1ZXVlLT5kaXNwYXRjaChbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vh a1B0cih0aGlzKSwgc2FsdFBhdGggPSBXVEZNb3ZlKHNhbHRQYXRoKV0gKCkgbXV0YWJsZSB7CiAg ICAgICAgIFdlYkNvcmU6OkZpbGVTeXN0ZW06Om1ha2VBbGxEaXJlY3RvcmllcyhtX3Jvb3RQYXRo KTsKLSAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtwcm90ZWN0ZWRUaGlzID0gV1RG TW92ZShwcm90ZWN0ZWRUaGlzKSwgdGhpcywgc2FsdCA9IHJlYWRPck1ha2VTYWx0KHNhbHRQYXRo KSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgUnVu TG9vcDo6bWFpbigpLmRpc3BhdGNoKFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKHRoaXMp LCBzYWx0ID0gcmVhZE9yTWFrZVNhbHQoc2FsdFBhdGgpXSgpIG11dGFibGUgeworICAgICAgICAg ICAgaWYgKCF3ZWFrVGhpcykKKyAgICAgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgICAg IGlmICghc2FsdCkgewotICAgICAgICAgICAgICAgIGNhbGxiYWNrKEVycm9yOjpXcml0ZURpc2sp OworICAgICAgICAgICAgICAgIG1faW5pdGlhbGl6YXRpb25DYWxsYmFjayhFcnJvcjo6V3JpdGVE aXNrKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICBtX3NhbHQgPSBXVEZNb3ZlKHNhbHQpOwotICAgICAgICAgICAgY2FsbGJhY2soc3RkOjpudWxs b3B0KTsKKyAgICAgICAgICAgIG1faW5pdGlhbGl6YXRpb25DYWxsYmFjayhzdGQ6Om51bGxvcHQp OwogICAgICAgICB9KTsKICAgICB9KTsKIH0KQEAgLTI3NywxMCArMjk2LDE1IEBAIHZvaWQgRW5n aW5lOjp3cml0ZUZpbGUoY29uc3QgU3RyaW5nJiBmaWxlbmFtZSwgTmV0d29ya0NhY2hlOjpEYXRh JiYgZGF0YSwgV2ViQ29yCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBtX2lvUXVldWUt PmRpc3BhdGNoKFtjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBkYXRhID0gV1RGTW92ZShk YXRhKSwgZmlsZW5hbWUgPSBmaWxlbmFtZS5pc29sYXRlZENvcHkoKV0gKCkgbXV0YWJsZSB7Cisg ICAgbV9wZW5kaW5nV3JpdGVDYWxsYmFja3MuYWRkKCsrbV9wZW5kaW5nQ2FsbGJhY2tzQ291bnRl ciwgV1RGTW92ZShjYWxsYmFjaykpOworICAgIG1faW9RdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHdl YWtUaGlzID0gbWFrZVdlYWtQdHIodGhpcyksIGlkZW50aWZpZXIgPSBtX3BlbmRpbmdDYWxsYmFj a3NDb3VudGVyLCBkYXRhID0gV1RGTW92ZShkYXRhKSwgZmlsZW5hbWUgPSBmaWxlbmFtZS5pc29s YXRlZENvcHkoKV0gKCkgbXV0YWJsZSB7CiAgICAgICAgIGF1dG8gY2hhbm5lbCA9IElPQ2hhbm5l bDo6b3BlbihmaWxlbmFtZSwgSU9DaGFubmVsOjpUeXBlOjpDcmVhdGUpOwotICAgICAgICBjaGFu bmVsLT53cml0ZSgwLCBkYXRhLCBudWxscHRyLCBbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNr KV0oaW50IGVycm9yKSBtdXRhYmxlIHsKKyAgICAgICAgY2hhbm5lbC0+d3JpdGUoMCwgZGF0YSwg bnVsbHB0ciwgW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIodGhpcyksIGlkZW50aWZpZXJd KGludCBlcnJvcikgbXV0YWJsZSB7CiAgICAgICAgICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWlu KCkpOworICAgICAgICAgICAgaWYgKCF3ZWFrVGhpcykKKyAgICAgICAgICAgICAgICByZXR1cm47 CisKKyAgICAgICAgICAgIGF1dG8gY2FsbGJhY2sgPSBtX3BlbmRpbmdXcml0ZUNhbGxiYWNrcy50 YWtlKGlkZW50aWZpZXIpOwogICAgICAgICAgICAgaWYgKGVycm9yKSB7CiAgICAgICAgICAgICAg ICAgUkVMRUFTRV9MT0dfRVJST1IoQ2FjaGVTdG9yYWdlLCAiQ2FjaGVTdG9yYWdlOjpFbmdpbmU6 OndyaXRlRmlsZSBmYWlsZWQgd2l0aCBlcnJvciAlZCIsIGVycm9yKTsKIApAQCAtMjkyLDI4ICsz MTYsMzYgQEAgdm9pZCBFbmdpbmU6OndyaXRlRmlsZShjb25zdCBTdHJpbmcmIGZpbGVuYW1lLCBO ZXR3b3JrQ2FjaGU6OkRhdGEmJiBkYXRhLCBXZWJDb3IKICAgICB9KTsKIH0KIAotdm9pZCBFbmdp bmU6OnJlYWRGaWxlKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUsIFdURjo6RnVuY3Rpb248dm9pZChj b25zdCBOZXR3b3JrQ2FjaGU6OkRhdGEmLCBpbnQgZXJyb3IpPiYmIGNhbGxiYWNrKQordm9pZCBF bmdpbmU6OnJlYWRGaWxlKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUsIENvbXBsZXRpb25IYW5kbGVy PHZvaWQoY29uc3QgTmV0d29ya0NhY2hlOjpEYXRhJiwgaW50IGVycm9yKT4mJiBjYWxsYmFjaykK IHsKICAgICBpZiAoIXNob3VsZFBlcnNpc3QoKSkgewogICAgICAgICBjYWxsYmFjayhEYXRhIHsg fSwgMCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBtX2lvUXVldWUtPmRpc3BhdGNo KFtjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBmaWxlbmFtZSA9IGZpbGVuYW1lLmlzb2xh dGVkQ29weSgpXSgpIG11dGFibGUgeworICAgIG1fcGVuZGluZ1JlYWRDYWxsYmFja3MuYWRkKCsr bV9wZW5kaW5nQ2FsbGJhY2tzQ291bnRlciwgV1RGTW92ZShjYWxsYmFjaykpOworICAgIG1faW9R dWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIodGhpcyksIGlkZW50 aWZpZXIgPSBtX3BlbmRpbmdDYWxsYmFja3NDb3VudGVyLCBmaWxlbmFtZSA9IGZpbGVuYW1lLmlz b2xhdGVkQ29weSgpXSgpIG11dGFibGUgewogICAgICAgICBhdXRvIGNoYW5uZWwgPSBJT0NoYW5u ZWw6Om9wZW4oZmlsZW5hbWUsIElPQ2hhbm5lbDo6VHlwZTo6UmVhZCk7CiAgICAgICAgIGlmIChj aGFubmVsLT5maWxlRGVzY3JpcHRvcigpIDwgMCkgewotICAgICAgICAgICAgUnVuTG9vcDo6bWFp bigpLmRpc3BhdGNoKFtjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXSgpIG11dGFibGUgewot ICAgICAgICAgICAgICAgIGNhbGxiYWNrKERhdGEgeyB9LCAwKTsKKyAgICAgICAgICAgIFJ1bkxv b3A6Om1haW4oKS5kaXNwYXRjaChbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cih0aGlzKSwg aWRlbnRpZmllcl0oKSBtdXRhYmxlIHsKKyAgICAgICAgICAgICAgICBpZiAoIXdlYWtUaGlzKQor ICAgICAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgICAgICBtX3BlbmRpbmdS ZWFkQ2FsbGJhY2tzLnRha2UoaWRlbnRpZmllcikoRGF0YSB7IH0sIDApOwogICAgICAgICAgICAg fSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBjaGFubmVsLT5y ZWFkKDAsIHN0ZDo6bnVtZXJpY19saW1pdHM8c2l6ZV90Pjo6bWF4KCksIG51bGxwdHIsIFtjYWxs YmFjayA9IFdURk1vdmUoY2FsbGJhY2spXShjb25zdCBEYXRhJiBkYXRhLCBpbnQgZXJyb3IpIG11 dGFibGUgeworICAgICAgICBjaGFubmVsLT5yZWFkKDAsIHN0ZDo6bnVtZXJpY19saW1pdHM8c2l6 ZV90Pjo6bWF4KCksIG51bGxwdHIsIFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKHRoaXMp LCBpZGVudGlmaWVyXShjb25zdCBEYXRhJiBkYXRhLCBpbnQgZXJyb3IpIG11dGFibGUgewogICAg ICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1JfSUYoZXJyb3IsIENhY2hlU3RvcmFnZSwgIkNhY2hl U3RvcmFnZTo6RW5naW5lOjpyZWFkRmlsZSBmYWlsZWQgd2l0aCBlcnJvciAlZCIsIGVycm9yKTsK IAogICAgICAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBkbyB0aGUgZGVjb2RpbmcgaW4gdGhl IGJhY2tncm91bmQgdGhyZWFkLgogICAgICAgICAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigp KTsKLSAgICAgICAgICAgIGNhbGxiYWNrKGRhdGEsIGVycm9yKTsKKworICAgICAgICAgICAgaWYg KCF3ZWFrVGhpcykKKyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIG1fcGVu ZGluZ1JlYWRDYWxsYmFja3MudGFrZShpZGVudGlmaWVyKShkYXRhLCBlcnJvcik7CiAgICAgICAg IH0pOwogICAgIH0pOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmgKaW5kZXggMDc1ZWVlNWZjZDM5OTk4YTNlNDE5 NGJmMTEzYmIzNjQzMjhjNjkwNC4uZDdlNWVmNzc2YjUwZjE5N2YwNTI3NzcyOTg5OTE4NTc3MThk OTEyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNo ZVN0b3JhZ2VFbmdpbmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hl L0NhY2hlU3RvcmFnZUVuZ2luZS5oCkBAIC0zMCw3ICszMCw4IEBACiAjaW5jbHVkZSAiV2Vic2l0 ZURhdGEuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0NsaWVudE9yaWdpbi5oPgogI2luY2x1ZGUgPHd0 Zi9IYXNoTWFwLmg+Ci0jaW5jbHVkZSA8d3RmL1RocmVhZFNhZmVSZWZDb3VudGVkLmg+CisjaW5j bHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KKyNpbmNsdWRlIDx3dGYvV2Vha1B0ci5oPgogI2luY2x1 ZGUgPHd0Zi9Xb3JrUXVldWUuaD4KIAogbmFtZXNwYWNlIElQQyB7CkBAIC01Miw3ICs1Myw3IEBA IG5hbWVzcGFjZSBDYWNoZVN0b3JhZ2UgewogdXNpbmcgQ2FjaGVJZGVudGlmaWVyID0gdWludDY0 X3Q7CiB1c2luZyBMb2NrQ291bnQgPSB1aW50NjRfdDsKIAotY2xhc3MgRW5naW5lIDogcHVibGlj IFRocmVhZFNhZmVSZWZDb3VudGVkPEVuZ2luZT4geworY2xhc3MgRW5naW5lIDogcHVibGljIFJl ZkNvdW50ZWQ8RW5naW5lPiB7CiBwdWJsaWM6CiAgICAgfkVuZ2luZSgpOwogCkBAIC03Niw3ICs3 Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHVubG9jayh1aW50NjRfdCBjYWNoZUlkZW50aWZpZXIp OwogCiAgICAgdm9pZCB3cml0ZUZpbGUoY29uc3QgU3RyaW5nJiBmaWxlbmFtZSwgTmV0d29ya0Nh Y2hlOjpEYXRhJiYsIFdlYkNvcmU6OkRPTUNhY2hlRW5naW5lOjpDb21wbGV0aW9uQ2FsbGJhY2sm Jik7Ci0gICAgdm9pZCByZWFkRmlsZShjb25zdCBTdHJpbmcmIGZpbGVuYW1lLCBXVEY6OkZ1bmN0 aW9uPHZvaWQoY29uc3QgTmV0d29ya0NhY2hlOjpEYXRhJiwgaW50IGVycm9yKT4mJik7CisgICAg dm9pZCByZWFkRmlsZShjb25zdCBTdHJpbmcmIGZpbGVuYW1lLCBDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKGNvbnN0IE5ldHdvcmtDYWNoZTo6RGF0YSYsIGludCBlcnJvcik+JiYpOwogICAgIHZvaWQg cmVtb3ZlRmlsZShjb25zdCBTdHJpbmcmIGZpbGVuYW1lKTsKIAogICAgIGNvbnN0IFN0cmluZyYg cm9vdFBhdGgoKSBjb25zdCB7IHJldHVybiBtX3Jvb3RQYXRoOyB9CkBAIC04OSw2ICs5MCw4IEBA IHB1YmxpYzoKICAgICB2b2lkIGNsZWFyQWxsQ2FjaGVzKFdURjo6Q2FsbGJhY2tBZ2dyZWdhdG9y Jik7CiAgICAgdm9pZCBjbGVhckNhY2hlc0Zvck9yaWdpbihjb25zdCBXZWJDb3JlOjpTZWN1cml0 eU9yaWdpbkRhdGEmLCBXVEY6OkNhbGxiYWNrQWdncmVnYXRvciYpOwogCisgICAgV2Vha1B0ckZh Y3Rvcnk8RW5naW5lPiYgd2Vha1B0ckZhY3RvcnkoKSB7IHJldHVybiBtX3dlYWtGYWN0b3J5OyB9 CisKIHByaXZhdGU6CiAgICAgc3RhdGljIEVuZ2luZSYgZGVmYXVsdEVuZ2luZSgpOwogICAgIGV4 cGxpY2l0IEVuZ2luZShTdHJpbmcmJiByb290UGF0aCk7CkBAIC05Nyw3ICsxMDAsNyBAQCBwcml2 YXRlOgogCiAgICAgdm9pZCBmZXRjaEVudHJpZXMoYm9vbCAvKiBzaG91bGRDb21wdXRlU2l6ZSAq LywgV1RGOjpDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3RvcjxXZWJzaXRlRGF0YTo6RW50cnk+ KT4mJik7CiAKLSAgICB2b2lkIGluaXRpYWxpemUoV1RGOjpGdW5jdGlvbjx2b2lkKHN0ZDo6b3B0 aW9uYWw8V2ViQ29yZTo6RE9NQ2FjaGVFbmdpbmU6OkVycm9yPiYmKT4mJik7CisgICAgdm9pZCBp bml0aWFsaXplKFdlYkNvcmU6OkRPTUNhY2hlRW5naW5lOjpDb21wbGV0aW9uQ2FsbGJhY2smJik7 CiAKICAgICB1c2luZyBDYWNoZXNPckVycm9yID0gRXhwZWN0ZWQ8c3RkOjpyZWZlcmVuY2Vfd3Jh cHBlcjxDYWNoZXM+LCBXZWJDb3JlOjpET01DYWNoZUVuZ2luZTo6RXJyb3I+OwogICAgIHVzaW5n IENhY2hlc0NhbGxiYWNrID0gV1RGOjpGdW5jdGlvbjx2b2lkKENhY2hlc09yRXJyb3ImJik+OwpA QCAtMTE1LDYgKzExOCwxMSBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxXb3JrUXVldWU+IG1faW9R dWV1ZTsKICAgICBzdGQ6Om9wdGlvbmFsPE5ldHdvcmtDYWNoZTo6U2FsdD4gbV9zYWx0OwogICAg IEhhc2hNYXA8Q2FjaGVJZGVudGlmaWVyLCBMb2NrQ291bnQ+IG1fY2FjaGVMb2NrczsKKyAgICBX ZWJDb3JlOjpET01DYWNoZUVuZ2luZTo6Q29tcGxldGlvbkNhbGxiYWNrIG1faW5pdGlhbGl6YXRp b25DYWxsYmFjazsKKyAgICBXZWFrUHRyRmFjdG9yeTxFbmdpbmU+IG1fd2Vha0ZhY3Rvcnk7Cisg ICAgSGFzaE1hcDx1aW50NjRfdCwgV2ViQ29yZTo6RE9NQ2FjaGVFbmdpbmU6OkNvbXBsZXRpb25D YWxsYmFjaz4gbV9wZW5kaW5nV3JpdGVDYWxsYmFja3M7CisgICAgSGFzaE1hcDx1aW50NjRfdCwg Q29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBOZXR3b3JrQ2FjaGU6OkRhdGEmLCBpbnQgZXJy b3IpPj4gbV9wZW5kaW5nUmVhZENhbGxiYWNrczsKKyAgICB1aW50NjRfdCBtX3BlbmRpbmdDYWxs YmFja3NDb3VudGVyIHsgMCB9OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgQ2FjaGVTdG9yYWdlCg== 336385 2018-03-23 10:09:27 -0700 2018-03-23 11:02:34 -0700 Patch bug-183925-20180323100926.patch text/plain 10040 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5ODU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGEyMjdiZjNlOTY1Y2Y5Mjli ZGM1NjM5M2ZkMjRiNzRhZTRiN2QwZmEuLjMyOTM2YTNmZWYxNzQyNDUyODNhZmRmYWUyODI5ZGQ5 YjE5NWUxZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTgtMDMtMjMgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIENhY2hlU3RvcmFnZTo6RW5naW5l IHNob3VsZCBub3QgcmVmIGl0c2VsZiB3aGVuIGhvcHBpbmcgdG8gYSBiYWNrZ3JvdW5kIHRocmVh ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzOTI1 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zODU4MDQ4Mz4KKworICAgICAgICBSZXZpZXdlZCBi eSBDaHJpcyBEdW1lei4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3Igd2VhayBwb2ludGVycyB0 byBDYWNoZVN0b3JhZ2UgRW5naW5lLgorICAgICAgICBVc2Ugd2VhayBwb2ludGVyIHdoZW4gaG9w cGluZyB0byBiYWNrZ3JvdW5kIHRocmVhZHMuCisgICAgICAgIFN0b3JlIGNhbGxiYWNrcyBpbiBD YWNoZVN0b3JhZ2U6OkVuZ2luZSBtYXBzIHRvIGtlZXAgdGhlbSBiZWluZyBkZXN0cm95ZWQgaW4g dGhlIG1haW4gdGhyZWFkIG9ubHkuCisgICAgICAgIE1hZGUgc29tZSBjYWxsYmFja3MgQ29tcGxl dGlvbkhhbmRsZXIgYXMgYSBib251cy4KKworICAgICAgICBNYWRlIHN1cmUgdG8gdXNlIGp1c3Qg b25lIEVuZ2luZSBmb3IgYWxsIHByaXZhdGUgc2Vzc2lvbnMuCisKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpD YWNoZVN0b3JhZ2U6OkVuZ2luZTo6fkVuZ2luZSk6CisgICAgICAgIChXZWJLaXQ6OkNhY2hlU3Rv cmFnZTo6RW5naW5lOjpmcm9tKToKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpFbmdp bmU6OmluaXRpYWxpemUpOgorICAgICAgICAoV2ViS2l0OjpDYWNoZVN0b3JhZ2U6OkVuZ2luZTo6 d3JpdGVGaWxlKToKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpFbmdpbmU6OnJlYWRG aWxlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUu aDoKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpFbmdpbmU6OndlYWtQdHJGYWN0b3J5 KToKKwogMjAxOC0wMy0yMyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAg ICAgICAgTW92ZSByZXF1ZXN0IGNoZWNraW5nIG91dCBvZiBQaW5nTG9hZCBmb3IgZnV0dXJlIHJl dXNlIGluIE5ldHdvcmtMb2FkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5jcHAKaW5kZXggMmMxMDVjNDRjYzlhNTk1 NjEyMjY5MGJmMjBkZmNjNWJiMDRkZTEyMC4uNDVjNDdhMWJlNDA0NTFhMjQ5MjcyMWM5OGZjZjk0 NjBhZjYyYjk5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmNwcApAQCAtNjYsMTAgKzY2LDI0IEBAIEVuZ2lu ZTo6fkVuZ2luZSgpCiB7CiAgICAgZm9yIChhdXRvJiBjYWNoZXMgOiBtX2NhY2hlcy52YWx1ZXMo KSkKICAgICAgICAgY2FjaGVzLT5kZXRhY2goKTsKKworICAgIGlmIChtX2luaXRpYWxpemF0aW9u Q2FsbGJhY2spCisgICAgICAgIG1faW5pdGlhbGl6YXRpb25DYWxsYmFjayhFcnJvcjo6SW50ZXJu YWwpOworCisgICAgYXV0byB3cml0ZUNhbGxiYWNrcyA9IFdURk1vdmUobV9wZW5kaW5nV3JpdGVD YWxsYmFja3MpOworICAgIGZvciAoYXV0byYgY2FsbGJhY2sgOiB3cml0ZUNhbGxiYWNrcy52YWx1 ZXMoKSkKKyAgICAgICAgY2FsbGJhY2soRXJyb3I6OkludGVybmFsKTsKKworICAgIGF1dG8gcmVh ZENhbGxiYWNrcyA9IFdURk1vdmUobV9wZW5kaW5nUmVhZENhbGxiYWNrcyk7CisgICAgZm9yIChh dXRvJiBjYWxsYmFjayA6IHJlYWRDYWxsYmFja3MudmFsdWVzKCkpCisgICAgICAgIGNhbGxiYWNr KERhdGEgeyB9LCAxKTsKIH0KIAogRW5naW5lJiBFbmdpbmU6OmZyb20oUEFMOjpTZXNzaW9uSUQg c2Vzc2lvbklEKQogeworICAgIGlmIChzZXNzaW9uSUQuaXNFcGhlbWVyYWwoKSkKKyAgICAgICAg c2Vzc2lvbklEID0gUEFMOjpTZXNzaW9uSUQ6OmxlZ2FjeVByaXZhdGVTZXNzaW9uSUQoKTsKKwog ICAgIGF1dG8gYWRkUmVzdWx0ID0gZ2xvYmFsRW5naW5lTWFwKCkuYWRkKHNlc3Npb25JRCwgbnVs bHB0cik7CiAgICAgaWYgKGFkZFJlc3VsdC5pc05ld0VudHJ5KQogICAgICAgICBhZGRSZXN1bHQu aXRlcmF0b3ItPnZhbHVlID0gRW5naW5lOjpjcmVhdGUoTmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRv bigpLmNhY2hlU3RvcmFnZURpcmVjdG9yeShzZXNzaW9uSUQpKTsKQEAgLTE3OCw3ICsxOTIsNyBA QCB2b2lkIEVuZ2luZTo6ZGVsZXRlTWF0Y2hpbmdSZWNvcmRzKHVpbnQ2NF90IGNhY2hlSWRlbnRp ZmllciwgV2ViQ29yZTo6UmVzb3VyY2VSZQogICAgIH0pOwogfQogCi12b2lkIEVuZ2luZTo6aW5p dGlhbGl6ZShGdW5jdGlvbjx2b2lkKHN0ZDo6b3B0aW9uYWw8RXJyb3I+JiYpPiYmIGNhbGxiYWNr KQordm9pZCBFbmdpbmU6OmluaXRpYWxpemUoQ29tcGxldGlvbkNhbGxiYWNrJiYgY2FsbGJhY2sp CiB7CiAgICAgaWYgKG1fc2FsdCkgewogICAgICAgICBjYWxsYmFjayhzdGQ6Om51bGxvcHQpOwpA QCAtMTkwLDE2ICsyMDQsMjEgQEAgdm9pZCBFbmdpbmU6OmluaXRpYWxpemUoRnVuY3Rpb248dm9p ZChzdGQ6Om9wdGlvbmFsPEVycm9yPiYmKT4mJiBjYWxsYmFjaykKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAorICAgIG1faW5pdGlhbGl6YXRpb25DYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2sp OworCiAgICAgU3RyaW5nIHNhbHRQYXRoID0gV2ViQ29yZTo6RmlsZVN5c3RlbTo6cGF0aEJ5QXBw ZW5kaW5nQ29tcG9uZW50KG1fcm9vdFBhdGgsIEFTQ0lJTGl0ZXJhbCgic2FsdCIpKTsKLSAgICBt X2lvUXVldWUtPmRpc3BhdGNoKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHRoaXMs IGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIHNhbHRQYXRoID0gV1RGTW92ZShzYWx0UGF0 aCldICgpIG11dGFibGUgeworICAgIG1faW9RdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHdlYWtUaGlz ID0gbWFrZVdlYWtQdHIodGhpcyksIHNhbHRQYXRoID0gV1RGTW92ZShzYWx0UGF0aCldICgpIG11 dGFibGUgewogICAgICAgICBXZWJDb3JlOjpGaWxlU3lzdGVtOjptYWtlQWxsRGlyZWN0b3JpZXMo bV9yb290UGF0aCk7Ci0gICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbcHJvdGVjdGVk VGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIHRoaXMsIHNhbHQgPSByZWFkT3JNYWtlU2Fs dChzYWx0UGF0aCksIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKCkgbXV0YWJsZSB7Cisg ICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbdGhpcywgd2Vha1RoaXMgPSBXVEZNb3Zl KHdlYWtUaGlzKSwgc2FsdCA9IHJlYWRPck1ha2VTYWx0KHNhbHRQYXRoKV0oKSBtdXRhYmxlIHsK KyAgICAgICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCiAg ICAgICAgICAgICBpZiAoIXNhbHQpIHsKLSAgICAgICAgICAgICAgICBjYWxsYmFjayhFcnJvcjo6 V3JpdGVEaXNrKTsKKyAgICAgICAgICAgICAgICBtX2luaXRpYWxpemF0aW9uQ2FsbGJhY2soRXJy b3I6OldyaXRlRGlzayk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQog ICAgICAgICAgICAgbV9zYWx0ID0gV1RGTW92ZShzYWx0KTsKLSAgICAgICAgICAgIGNhbGxiYWNr KHN0ZDo6bnVsbG9wdCk7CisgICAgICAgICAgICBtX2luaXRpYWxpemF0aW9uQ2FsbGJhY2soc3Rk OjpudWxsb3B0KTsKICAgICAgICAgfSk7CiAgICAgfSk7CiB9CkBAIC0yNzcsMTAgKzI5NiwxNSBA QCB2b2lkIEVuZ2luZTo6d3JpdGVGaWxlKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUsIE5ldHdvcmtD YWNoZTo6RGF0YSYmIGRhdGEsIFdlYkNvcgogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAg bV9pb1F1ZXVlLT5kaXNwYXRjaChbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgZGF0YSA9 IFdURk1vdmUoZGF0YSksIGZpbGVuYW1lID0gZmlsZW5hbWUuaXNvbGF0ZWRDb3B5KCldICgpIG11 dGFibGUgeworICAgIG1fcGVuZGluZ1dyaXRlQ2FsbGJhY2tzLmFkZCgrK21fcGVuZGluZ0NhbGxi YWNrc0NvdW50ZXIsIFdURk1vdmUoY2FsbGJhY2spKTsKKyAgICBtX2lvUXVldWUtPmRpc3BhdGNo KFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKHRoaXMpLCBpZGVudGlmaWVyID0gbV9wZW5k aW5nQ2FsbGJhY2tzQ291bnRlciwgZGF0YSA9IFdURk1vdmUoZGF0YSksIGZpbGVuYW1lID0gZmls ZW5hbWUuaXNvbGF0ZWRDb3B5KCldICgpIG11dGFibGUgewogICAgICAgICBhdXRvIGNoYW5uZWwg PSBJT0NoYW5uZWw6Om9wZW4oZmlsZW5hbWUsIElPQ2hhbm5lbDo6VHlwZTo6Q3JlYXRlKTsKLSAg ICAgICAgY2hhbm5lbC0+d3JpdGUoMCwgZGF0YSwgbnVsbHB0ciwgW2NhbGxiYWNrID0gV1RGTW92 ZShjYWxsYmFjayldKGludCBlcnJvcikgbXV0YWJsZSB7CisgICAgICAgIGNoYW5uZWwtPndyaXRl KDAsIGRhdGEsIG51bGxwdHIsIFt0aGlzLCB3ZWFrVGhpcyA9IFdURk1vdmUod2Vha1RoaXMpLCBp ZGVudGlmaWVyXShpbnQgZXJyb3IpIG11dGFibGUgewogICAgICAgICAgICAgQVNTRVJUKFJ1bkxv b3A6OmlzTWFpbigpKTsKKyAgICAgICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICAg ICAgcmV0dXJuOworCisgICAgICAgICAgICBhdXRvIGNhbGxiYWNrID0gbV9wZW5kaW5nV3JpdGVD YWxsYmFja3MudGFrZShpZGVudGlmaWVyKTsKICAgICAgICAgICAgIGlmIChlcnJvcikgewogICAg ICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKENhY2hlU3RvcmFnZSwgIkNhY2hlU3RvcmFn ZTo6RW5naW5lOjp3cml0ZUZpbGUgZmFpbGVkIHdpdGggZXJyb3IgJWQiLCBlcnJvcik7CiAKQEAg LTI5MiwyOCArMzE2LDM2IEBAIHZvaWQgRW5naW5lOjp3cml0ZUZpbGUoY29uc3QgU3RyaW5nJiBm aWxlbmFtZSwgTmV0d29ya0NhY2hlOjpEYXRhJiYgZGF0YSwgV2ViQ29yCiAgICAgfSk7CiB9CiAK LXZvaWQgRW5naW5lOjpyZWFkRmlsZShjb25zdCBTdHJpbmcmIGZpbGVuYW1lLCBXVEY6OkZ1bmN0 aW9uPHZvaWQoY29uc3QgTmV0d29ya0NhY2hlOjpEYXRhJiwgaW50IGVycm9yKT4mJiBjYWxsYmFj aykKK3ZvaWQgRW5naW5lOjpyZWFkRmlsZShjb25zdCBTdHJpbmcmIGZpbGVuYW1lLCBDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKGNvbnN0IE5ldHdvcmtDYWNoZTo6RGF0YSYsIGludCBlcnJvcik+JiYg Y2FsbGJhY2spCiB7CiAgICAgaWYgKCFzaG91bGRQZXJzaXN0KCkpIHsKICAgICAgICAgY2FsbGJh Y2soRGF0YSB7IH0sIDApOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgbV9pb1F1ZXVl LT5kaXNwYXRjaChbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgZmlsZW5hbWUgPSBmaWxl bmFtZS5pc29sYXRlZENvcHkoKV0oKSBtdXRhYmxlIHsKKyAgICBtX3BlbmRpbmdSZWFkQ2FsbGJh Y2tzLmFkZCgrK21fcGVuZGluZ0NhbGxiYWNrc0NvdW50ZXIsIFdURk1vdmUoY2FsbGJhY2spKTsK KyAgICBtX2lvUXVldWUtPmRpc3BhdGNoKFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKHRo aXMpLCBpZGVudGlmaWVyID0gbV9wZW5kaW5nQ2FsbGJhY2tzQ291bnRlciwgZmlsZW5hbWUgPSBm aWxlbmFtZS5pc29sYXRlZENvcHkoKV0oKSBtdXRhYmxlIHsKICAgICAgICAgYXV0byBjaGFubmVs ID0gSU9DaGFubmVsOjpvcGVuKGZpbGVuYW1lLCBJT0NoYW5uZWw6OlR5cGU6OlJlYWQpOwogICAg ICAgICBpZiAoY2hhbm5lbC0+ZmlsZURlc2NyaXB0b3IoKSA8IDApIHsKLSAgICAgICAgICAgIFJ1 bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oKSBt dXRhYmxlIHsKLSAgICAgICAgICAgICAgICBjYWxsYmFjayhEYXRhIHsgfSwgMCk7CisgICAgICAg ICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3RoaXMsIHdlYWtUaGlzID0gV1RGTW92ZSh3 ZWFrVGhpcyksIGlkZW50aWZpZXJdKCkgbXV0YWJsZSB7CisgICAgICAgICAgICAgICAgaWYgKCF3 ZWFrVGhpcykKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICAgICAg bV9wZW5kaW5nUmVhZENhbGxiYWNrcy50YWtlKGlkZW50aWZpZXIpKERhdGEgeyB9LCAwKTsKICAg ICAgICAgICAgIH0pOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAg Y2hhbm5lbC0+cmVhZCgwLCBzdGQ6Om51bWVyaWNfbGltaXRzPHNpemVfdD46Om1heCgpLCBudWxs cHRyLCBbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oY29uc3QgRGF0YSYgZGF0YSwgaW50 IGVycm9yKSBtdXRhYmxlIHsKKyAgICAgICAgY2hhbm5lbC0+cmVhZCgwLCBzdGQ6Om51bWVyaWNf bGltaXRzPHNpemVfdD46Om1heCgpLCBudWxscHRyLCBbdGhpcywgd2Vha1RoaXMgPSBXVEZNb3Zl KHdlYWtUaGlzKSwgaWRlbnRpZmllcl0oY29uc3QgRGF0YSYgZGF0YSwgaW50IGVycm9yKSBtdXRh YmxlIHsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGKGVycm9yLCBDYWNoZVN0b3Jh Z2UsICJDYWNoZVN0b3JhZ2U6OkVuZ2luZTo6cmVhZEZpbGUgZmFpbGVkIHdpdGggZXJyb3IgJWQi LCBlcnJvcik7CiAKICAgICAgICAgICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgZG8gdGhlIGRlY29k aW5nIGluIHRoZSBiYWNrZ3JvdW5kIHRocmVhZC4KICAgICAgICAgICAgIEFTU0VSVChSdW5Mb29w Ojppc01haW4oKSk7Ci0gICAgICAgICAgICBjYWxsYmFjayhkYXRhLCBlcnJvcik7CisKKyAgICAg ICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAg ICAgICBtX3BlbmRpbmdSZWFkQ2FsbGJhY2tzLnRha2UoaWRlbnRpZmllcikoZGF0YSwgZXJyb3Ip OwogICAgICAgICB9KTsKICAgICB9KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmggYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5oCmluZGV4IDA3NWVlZTVmY2Qz OTk5OGEzZTQxOTRiZjExM2JiMzY0MzI4YzY5MDQuLmQ3ZTVlZjc3NmI1MGYxOTdmMDUyNzc3Mjk4 OTkxODU3NzE4ZDkxMjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuaApAQCAtMzAsNyArMzAsOCBAQAogI2luY2x1 ZGUgIldlYnNpdGVEYXRhLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9DbGllbnRPcmlnaW4uaD4KICNp bmNsdWRlIDx3dGYvSGFzaE1hcC5oPgotI2luY2x1ZGUgPHd0Zi9UaHJlYWRTYWZlUmVmQ291bnRl ZC5oPgorI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CisjaW5jbHVkZSA8d3RmL1dlYWtQdHIu aD4KICNpbmNsdWRlIDx3dGYvV29ya1F1ZXVlLmg+CiAKIG5hbWVzcGFjZSBJUEMgewpAQCAtNTIs NyArNTMsNyBAQCBuYW1lc3BhY2UgQ2FjaGVTdG9yYWdlIHsKIHVzaW5nIENhY2hlSWRlbnRpZmll ciA9IHVpbnQ2NF90OwogdXNpbmcgTG9ja0NvdW50ID0gdWludDY0X3Q7CiAKLWNsYXNzIEVuZ2lu ZSA6IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxFbmdpbmU+IHsKK2NsYXNzIEVuZ2luZSA6 IHB1YmxpYyBSZWZDb3VudGVkPEVuZ2luZT4gewogcHVibGljOgogICAgIH5FbmdpbmUoKTsKIApA QCAtNzYsNyArNzcsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCB1bmxvY2sodWludDY0X3QgY2FjaGVJ ZGVudGlmaWVyKTsKIAogICAgIHZvaWQgd3JpdGVGaWxlKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUs IE5ldHdvcmtDYWNoZTo6RGF0YSYmLCBXZWJDb3JlOjpET01DYWNoZUVuZ2luZTo6Q29tcGxldGlv bkNhbGxiYWNrJiYpOwotICAgIHZvaWQgcmVhZEZpbGUoY29uc3QgU3RyaW5nJiBmaWxlbmFtZSwg V1RGOjpGdW5jdGlvbjx2b2lkKGNvbnN0IE5ldHdvcmtDYWNoZTo6RGF0YSYsIGludCBlcnJvcik+ JiYpOworICAgIHZvaWQgcmVhZEZpbGUoY29uc3QgU3RyaW5nJiBmaWxlbmFtZSwgQ29tcGxldGlv bkhhbmRsZXI8dm9pZChjb25zdCBOZXR3b3JrQ2FjaGU6OkRhdGEmLCBpbnQgZXJyb3IpPiYmKTsK ICAgICB2b2lkIHJlbW92ZUZpbGUoY29uc3QgU3RyaW5nJiBmaWxlbmFtZSk7CiAKICAgICBjb25z dCBTdHJpbmcmIHJvb3RQYXRoKCkgY29uc3QgeyByZXR1cm4gbV9yb290UGF0aDsgfQpAQCAtODks NiArOTAsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBjbGVhckFsbENhY2hlcyhXVEY6OkNhbGxiYWNr QWdncmVnYXRvciYpOwogICAgIHZvaWQgY2xlYXJDYWNoZXNGb3JPcmlnaW4oY29uc3QgV2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiwgV1RGOjpDYWxsYmFja0FnZ3JlZ2F0b3ImKTsKIAorICAg IFdlYWtQdHJGYWN0b3J5PEVuZ2luZT4mIHdlYWtQdHJGYWN0b3J5KCkgeyByZXR1cm4gbV93ZWFr RmFjdG9yeTsgfQorCiBwcml2YXRlOgogICAgIHN0YXRpYyBFbmdpbmUmIGRlZmF1bHRFbmdpbmUo KTsKICAgICBleHBsaWNpdCBFbmdpbmUoU3RyaW5nJiYgcm9vdFBhdGgpOwpAQCAtOTcsNyArMTAw LDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgZmV0Y2hFbnRyaWVzKGJvb2wgLyogc2hvdWxkQ29t cHV0ZVNpemUgKi8sIFdURjo6Q29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8V2Vic2l0ZURh dGE6OkVudHJ5Pik+JiYpOwogCi0gICAgdm9pZCBpbml0aWFsaXplKFdURjo6RnVuY3Rpb248dm9p ZChzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OkRPTUNhY2hlRW5naW5lOjpFcnJvcj4mJik+JiYpOwor ICAgIHZvaWQgaW5pdGlhbGl6ZShXZWJDb3JlOjpET01DYWNoZUVuZ2luZTo6Q29tcGxldGlvbkNh bGxiYWNrJiYpOwogCiAgICAgdXNpbmcgQ2FjaGVzT3JFcnJvciA9IEV4cGVjdGVkPHN0ZDo6cmVm ZXJlbmNlX3dyYXBwZXI8Q2FjaGVzPiwgV2ViQ29yZTo6RE9NQ2FjaGVFbmdpbmU6OkVycm9yPjsK ICAgICB1c2luZyBDYWNoZXNDYWxsYmFjayA9IFdURjo6RnVuY3Rpb248dm9pZChDYWNoZXNPckVy cm9yJiYpPjsKQEAgLTExNSw2ICsxMTgsMTEgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8V29ya1F1 ZXVlPiBtX2lvUXVldWU7CiAgICAgc3RkOjpvcHRpb25hbDxOZXR3b3JrQ2FjaGU6OlNhbHQ+IG1f c2FsdDsKICAgICBIYXNoTWFwPENhY2hlSWRlbnRpZmllciwgTG9ja0NvdW50PiBtX2NhY2hlTG9j a3M7CisgICAgV2ViQ29yZTo6RE9NQ2FjaGVFbmdpbmU6OkNvbXBsZXRpb25DYWxsYmFjayBtX2lu aXRpYWxpemF0aW9uQ2FsbGJhY2s7CisgICAgV2Vha1B0ckZhY3Rvcnk8RW5naW5lPiBtX3dlYWtG YWN0b3J5OworICAgIEhhc2hNYXA8dWludDY0X3QsIFdlYkNvcmU6OkRPTUNhY2hlRW5naW5lOjpD b21wbGV0aW9uQ2FsbGJhY2s+IG1fcGVuZGluZ1dyaXRlQ2FsbGJhY2tzOworICAgIEhhc2hNYXA8 dWludDY0X3QsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgTmV0d29ya0NhY2hlOjpEYXRh JiwgaW50IGVycm9yKT4+IG1fcGVuZGluZ1JlYWRDYWxsYmFja3M7CisgICAgdWludDY0X3QgbV9w ZW5kaW5nQ2FsbGJhY2tzQ291bnRlciB7IDAgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIENhY2hl U3RvcmFnZQo=