193237 2019-01-08 08:15:39 -0800 Always call CompletionHandler in Cache::store 2019-01-08 17:28:52 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez cgarcia ews-watchlist koivisto tsavell webkit-bug-importer oldest_to_newest 1492600 0 achristensen 2019-01-08 08:15:39 -0800 Always call CompletionHandler in Cache::store 1492601 1 358592 achristensen 2019-01-08 08:16:52 -0800 Created attachment 358592 Patch 1492602 2 358593 achristensen 2019-01-08 08:24:52 -0800 Created attachment 358593 Patch 1492607 3 achristensen 2019-01-08 08:43:27 -0800 http://trac.webkit.org/r239725 1492608 4 webkit-bug-importer 2019-01-08 08:44:30 -0800 <rdar://problem/47116303> 1492748 5 tsavell 2019-01-08 13:49:48 -0800 Changes in https://trac.webkit.org/changeset/239725/webkit Has caused http/tests/cache/disk-cache/disk-cache-disable.html To crash continuously. History: http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=http%2Ftests%2Fcache%2Fdisk-cache%2Fdisk-cache-disable.html reproduced with: run-webkit-tests --root testbuild-239725 http/tests/cache/disk-cache/disk-cache-disable.html --iterations 10 -f 1492761 6 achristensen 2019-01-08 14:23:24 -0800 http://trac.webkit.org/r239748 should fix that. 1492830 7 achristensen 2019-01-08 17:28:52 -0800 http://trac.webkit.org/r239759 reverted all my fixes and the problem I introduced today. Bots should be green. I unfortunately cannot run tests on my machine 358592 2019-01-08 08:16:52 -0800 2019-01-08 08:24:50 -0800 Patch bug-193237-20190108081651.patch text/plain 6099 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzk3MjQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE5LTAxLTA4ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWx3YXlzIGNhbGwg Q29tcGxldGlvbkhhbmRsZXIgaW4gQ2FjaGU6OnN0b3JlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMyMzcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuIFRoaXMganVz dCBmaXhlcyBhbiBhc3NlcnRpb24gaW50cm9kdWNlZCBpbiByMjM5NzEwIHdoZW4gdGhlIHNwZWN1 bGF0aXZlIGxvYWRlciBmaW5pc2hlcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdv cmtSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxv YWRlcjo6dHJ5U3RvcmVBc0NhY2hlRW50cnkpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2Nh Y2hlL05ldHdvcmtDYWNoZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6Q2Fj aGU6OnN0b3JlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUu aDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2 ZUxvYWQuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlNwZWN1bGF0aXZlTG9h ZDo6ZGlkRmluaXNoTG9hZGluZyk6CisKIDIwMTktMDEtMDggIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIFVwZGF0ZSBPcHRp b25zR1RLLmNtYWtlIGFuZCBORVdTIGZvciAyLjIzLjIgcmVsZWFzZQpJbmRleDogU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNw cAkocmV2aXNpb24gMjM5NjgwKQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrUmVzb3VyY2VMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03OTQsMTIgKzc5NCwxMiBA QCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6dHJ5U3RvcmVBc0NhCiAgICAgaWYgKCFtX2J1 ZmZlcmVkRGF0YUZvckNhY2hlKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2NhY2hlLT5zdG9y ZShtX25ldHdvcmtMb2FkLT5jdXJyZW50UmVxdWVzdCgpLCBtX3Jlc3BvbnNlLCBXVEZNb3ZlKG1f YnVmZmVyZWREYXRhRm9yQ2FjaGUpLCBbbG9hZGVyID0gbWFrZVJlZigqdGhpcyldKGF1dG8mIG1h cHBlZEJvZHkpIG11dGFibGUgeworICAgIG1fY2FjaGUtPnN0b3JlKG1fbmV0d29ya0xvYWQtPmN1 cnJlbnRSZXF1ZXN0KCksIG1fcmVzcG9uc2UsIFdURk1vdmUobV9idWZmZXJlZERhdGFGb3JDYWNo ZSksIFtsb2FkZXIgPSBtYWtlUmVmKCp0aGlzKV0oYXV0byogbWFwcGVkQm9keSkgbXV0YWJsZSB7 CiAjaWYgRU5BQkxFKFNIQVJFQUJMRV9SRVNPVVJDRSkKLSAgICAgICAgaWYgKG1hcHBlZEJvZHku c2hhcmVhYmxlUmVzb3VyY2VIYW5kbGUuaXNOdWxsKCkpCisgICAgICAgIGlmICghbWFwcGVkQm9k eSB8fCBtYXBwZWRCb2R5LT5zaGFyZWFibGVSZXNvdXJjZUhhbmRsZS5pc051bGwoKSkKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3JrUHJvY2Vz cykgc2VuZGluZyBEaWRDYWNoZVJlc291cmNlIik7Ci0gICAgICAgIGxvYWRlci0+c2VuZChNZXNz YWdlczo6TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uOjpEaWRDYWNoZVJlc291cmNlKGxvYWRlci0+ b3JpZ2luYWxSZXF1ZXN0KCksIG1hcHBlZEJvZHkuc2hhcmVhYmxlUmVzb3VyY2VIYW5kbGUsIGxv YWRlci0+c2Vzc2lvbklEKCkpKTsKKyAgICAgICAgbG9hZGVyLT5zZW5kKE1lc3NhZ2VzOjpOZXR3 b3JrUHJvY2Vzc0Nvbm5lY3Rpb246OkRpZENhY2hlUmVzb3VyY2UobG9hZGVyLT5vcmlnaW5hbFJl cXVlc3QoKSwgbWFwcGVkQm9keS0+c2hhcmVhYmxlUmVzb3VyY2VIYW5kbGUsIGxvYWRlci0+c2Vz c2lvbklEKCkpKTsKICNlbmRpZgogICAgIH0pOwogfQpJbmRleDogU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcAkocmV2aXNpb24gMjM5 NzEwKQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNzEsNyArMzcxLDcgQEAgc3RkOjp1bmlxdWVfcHRyPEVu dHJ5PiBDYWNoZTo6bWFrZVJlZGlyZQogICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPEVudHJ5 PihtYWtlQ2FjaGVLZXkocmVxdWVzdCksIHJlc3BvbnNlLCByZWRpcmVjdFJlcXVlc3QsIFdlYkNv cmU6OmNvbGxlY3RWYXJ5aW5nUmVxdWVzdEhlYWRlcnMocmVxdWVzdCwgcmVzcG9uc2UpKTsKIH0K IAotc3RkOjp1bmlxdWVfcHRyPEVudHJ5PiBDYWNoZTo6c3RvcmUoY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiBy ZXNwb25zZSwgUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4mJiByZXNwb25zZURhdGEsIENv bXBsZXRpb25IYW5kbGVyPHZvaWQoTWFwcGVkQm9keSYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQor c3RkOjp1bmlxdWVfcHRyPEVudHJ5PiBDYWNoZTo6c3RvcmUoY29uc3QgV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiByZXNw b25zZSwgUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4mJiByZXNwb25zZURhdGEsIENvbXBs ZXRpb25IYW5kbGVyPHZvaWQoTWFwcGVkQm9keSopPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewog ICAgIEFTU0VSVChyZXNwb25zZURhdGEpOwogCkBAIC0zOTEsNiArMzkxLDcgQEAgc3RkOjp1bmlx dWVfcHRyPEVudHJ5PiBDYWNoZTo6c3RvcmUoY29ucwogICAgICAgICBpZiAobV9zdGF0aXN0aWNz KQogICAgICAgICAgICAgbV9zdGF0aXN0aWNzLT5yZWNvcmROb3RDYWNoaW5nUmVzcG9uc2Uoa2V5 LCBzdG9yZURlY2lzaW9uKTsKIAorICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihudWxscHRyKTsK ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCkBAIC00MDYsNyArNDA3LDcgQEAgc3Rk Ojp1bmlxdWVfcHRyPEVudHJ5PiBDYWNoZTo6c3RvcmUoY29ucwogICAgICAgICAgICAgbWFwcGVk Qm9keS5zaGFyZWFibGVSZXNvdXJjZS0+Y3JlYXRlSGFuZGxlKG1hcHBlZEJvZHkuc2hhcmVhYmxl UmVzb3VyY2VIYW5kbGUpOwogICAgICAgICB9CiAjZW5kaWYKLSAgICAgICAgY29tcGxldGlvbkhh bmRsZXIobWFwcGVkQm9keSk7CisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCZtYXBwZWRCb2R5 KTsKICAgICAgICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3JrUHJvY2Vzcykgc3RvcmVkIik7 CiAgICAgfSk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0 d29ya0NhY2hlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGUuaAkocmV2aXNpb24gMjM5NzEwKQorKysgU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuaAkod29ya2luZyBjb3B5KQpAQCAtMTEz LDcgKzExMyw3IEBAIHB1YmxpYzoKICAgICB9OwogICAgIHVzaW5nIFJldHJpZXZlQ29tcGxldGlv bkhhbmRsZXIgPSBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKHN0ZDo6dW5pcXVlX3B0cjxFbnRyeT4s IGNvbnN0IFJldHJpZXZlSW5mbyYpPjsKICAgICB2b2lkIHJldHJpZXZlKGNvbnN0IFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IEdsb2JhbEZyYW1lSUQmLCBSZXRyaWV2ZUNvbXBsZXRp b25IYW5kbGVyJiYpOwotICAgIHN0ZDo6dW5pcXVlX3B0cjxFbnRyeT4gc3RvcmUoY29uc3QgV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYs IFJlZlB0cjxXZWJDb3JlOjpTaGFyZWRCdWZmZXI+JiYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo TWFwcGVkQm9keSYpPiYmKTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RW50cnk+IHN0b3JlKGNvbnN0 IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9u c2UmLCBSZWZQdHI8V2ViQ29yZTo6U2hhcmVkQnVmZmVyPiYmLCBDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKE1hcHBlZEJvZHkqKT4mJik7CiAgICAgc3RkOjp1bmlxdWVfcHRyPEVudHJ5PiBzdG9yZVJl ZGlyZWN0KGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFdlYkNvcmU6OlJl c291cmNlUmVzcG9uc2UmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlZGlyZWN0 UmVxdWVzdCwgT3B0aW9uYWw8U2Vjb25kcz4gbWF4QWdlQ2FwKTsKICAgICBzdGQ6OnVuaXF1ZV9w dHI8RW50cnk+IHVwZGF0ZShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBH bG9iYWxGcmFtZUlEJiwgY29uc3QgRW50cnkmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlJiB2YWxpZGF0aW5nUmVzcG9uc2UpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxh dGl2ZUxvYWQuY3BwCShyZXZpc2lvbiAyMzk2NzApCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEyMSw3ICsxMjEsNyBAQCB2b2lkIFNwZWN1bGF0aXZlTG9hZDo6ZGlkRmluaXNoTG9h ZGluZyhjCiAgICAgaWYgKG1fZGlkQ29tcGxldGUpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAo IW1fY2FjaGVFbnRyeSAmJiBtX2J1ZmZlcmVkRGF0YUZvckNhY2hlKSB7Ci0gICAgICAgIG1fY2Fj aGVFbnRyeSA9IG1fY2FjaGUtPnN0b3JlKG1fb3JpZ2luYWxSZXF1ZXN0LCBtX3Jlc3BvbnNlLCBt X2J1ZmZlcmVkRGF0YUZvckNhY2hlLmNvcHlSZWYoKSwgW10oYXV0byYgbWFwcGVkQm9keSkgeyB9 KTsKKyAgICAgICAgbV9jYWNoZUVudHJ5ID0gbV9jYWNoZS0+c3RvcmUobV9vcmlnaW5hbFJlcXVl c3QsIG1fcmVzcG9uc2UsIG1fYnVmZmVyZWREYXRhRm9yQ2FjaGUuY29weVJlZigpLCBbXShhdXRv KiBtYXBwZWRCb2R5KSB7IH0pOwogICAgICAgICAvLyBDcmVhdGUgYSBzeW50aGV0aWMgY2FjaGUg ZW50cnkgaWYgd2UgY2FuJ3Qgc3RvcmUuCiAgICAgICAgIGlmICghbV9jYWNoZUVudHJ5ICYmIGlz U3RhdHVzQ29kZUNhY2hlYWJsZUJ5RGVmYXVsdChtX3Jlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkp KQogICAgICAgICAgICAgbV9jYWNoZUVudHJ5ID0gbV9jYWNoZS0+bWFrZUVudHJ5KG1fb3JpZ2lu YWxSZXF1ZXN0LCBtX3Jlc3BvbnNlLCBXVEZNb3ZlKG1fYnVmZmVyZWREYXRhRm9yQ2FjaGUpKTsK 358593 2019-01-08 08:24:52 -0800 2019-01-08 08:42:11 -0800 Patch bug-193237-20190108082451.patch text/plain 6822 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzk3MjQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE5LTAxLTA4ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWx3YXlzIGNhbGwg Q29tcGxldGlvbkhhbmRsZXIgaW4gQ2FjaGU6OnN0b3JlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMyMzcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuIFRoaXMganVz dCBmaXhlcyBhbiBhc3NlcnRpb24gaW50cm9kdWNlZCBpbiByMjM5NzEwIHdoZW4gdGhlIHNwZWN1 bGF0aXZlIGxvYWRlciBmaW5pc2hlcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdv cmtSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxv YWRlcjo6dHJ5U3RvcmVBc0NhY2hlRW50cnkpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2Nh Y2hlL05ldHdvcmtDYWNoZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6Q2Fj aGU6OnN0b3JlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUu aDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2 ZUxvYWQuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlNwZWN1bGF0aXZlTG9h ZDo6ZGlkRmluaXNoTG9hZGluZyk6CisKIDIwMTktMDEtMDggIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIFVwZGF0ZSBPcHRp b25zR1RLLmNtYWtlIGFuZCBORVdTIGZvciAyLjIzLjIgcmVsZWFzZQpJbmRleDogU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNw cAkocmV2aXNpb24gMjM5NjgwKQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrUmVzb3VyY2VMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03OTQsMTIgKzc5NCwxMiBA QCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6dHJ5U3RvcmVBc0NhCiAgICAgaWYgKCFtX2J1 ZmZlcmVkRGF0YUZvckNhY2hlKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2NhY2hlLT5zdG9y ZShtX25ldHdvcmtMb2FkLT5jdXJyZW50UmVxdWVzdCgpLCBtX3Jlc3BvbnNlLCBXVEZNb3ZlKG1f YnVmZmVyZWREYXRhRm9yQ2FjaGUpLCBbbG9hZGVyID0gbWFrZVJlZigqdGhpcyldKGF1dG8mIG1h cHBlZEJvZHkpIG11dGFibGUgeworICAgIG1fY2FjaGUtPnN0b3JlKG1fbmV0d29ya0xvYWQtPmN1 cnJlbnRSZXF1ZXN0KCksIG1fcmVzcG9uc2UsIFdURk1vdmUobV9idWZmZXJlZERhdGFGb3JDYWNo ZSksIFtsb2FkZXIgPSBtYWtlUmVmKCp0aGlzKV0oYXV0byogbWFwcGVkQm9keSkgbXV0YWJsZSB7 CiAjaWYgRU5BQkxFKFNIQVJFQUJMRV9SRVNPVVJDRSkKLSAgICAgICAgaWYgKG1hcHBlZEJvZHku c2hhcmVhYmxlUmVzb3VyY2VIYW5kbGUuaXNOdWxsKCkpCisgICAgICAgIGlmICghbWFwcGVkQm9k eSB8fCBtYXBwZWRCb2R5LT5zaGFyZWFibGVSZXNvdXJjZUhhbmRsZS5pc051bGwoKSkKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3JrUHJvY2Vz cykgc2VuZGluZyBEaWRDYWNoZVJlc291cmNlIik7Ci0gICAgICAgIGxvYWRlci0+c2VuZChNZXNz YWdlczo6TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uOjpEaWRDYWNoZVJlc291cmNlKGxvYWRlci0+ b3JpZ2luYWxSZXF1ZXN0KCksIG1hcHBlZEJvZHkuc2hhcmVhYmxlUmVzb3VyY2VIYW5kbGUsIGxv YWRlci0+c2Vzc2lvbklEKCkpKTsKKyAgICAgICAgbG9hZGVyLT5zZW5kKE1lc3NhZ2VzOjpOZXR3 b3JrUHJvY2Vzc0Nvbm5lY3Rpb246OkRpZENhY2hlUmVzb3VyY2UobG9hZGVyLT5vcmlnaW5hbFJl cXVlc3QoKSwgbWFwcGVkQm9keS0+c2hhcmVhYmxlUmVzb3VyY2VIYW5kbGUsIGxvYWRlci0+c2Vz c2lvbklEKCkpKTsKICNlbmRpZgogICAgIH0pOwogfQpJbmRleDogU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcAkocmV2aXNpb24gMjM5 NzEwKQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNzEsNyArMzcxLDcgQEAgc3RkOjp1bmlxdWVfcHRyPEVu dHJ5PiBDYWNoZTo6bWFrZVJlZGlyZQogICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPEVudHJ5 PihtYWtlQ2FjaGVLZXkocmVxdWVzdCksIHJlc3BvbnNlLCByZWRpcmVjdFJlcXVlc3QsIFdlYkNv cmU6OmNvbGxlY3RWYXJ5aW5nUmVxdWVzdEhlYWRlcnMocmVxdWVzdCwgcmVzcG9uc2UpKTsKIH0K IAotc3RkOjp1bmlxdWVfcHRyPEVudHJ5PiBDYWNoZTo6c3RvcmUoY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiBy ZXNwb25zZSwgUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4mJiByZXNwb25zZURhdGEsIENv bXBsZXRpb25IYW5kbGVyPHZvaWQoTWFwcGVkQm9keSYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQor c3RkOjp1bmlxdWVfcHRyPEVudHJ5PiBDYWNoZTo6c3RvcmUoY29uc3QgV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiByZXNw b25zZSwgUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4mJiByZXNwb25zZURhdGEsIENvbXBs ZXRpb25IYW5kbGVyPHZvaWQoTWFwcGVkQm9keSopPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewog ICAgIEFTU0VSVChyZXNwb25zZURhdGEpOwogCkBAIC0zOTEsNiArMzkxLDcgQEAgc3RkOjp1bmlx dWVfcHRyPEVudHJ5PiBDYWNoZTo6c3RvcmUoY29ucwogICAgICAgICBpZiAobV9zdGF0aXN0aWNz KQogICAgICAgICAgICAgbV9zdGF0aXN0aWNzLT5yZWNvcmROb3RDYWNoaW5nUmVzcG9uc2Uoa2V5 LCBzdG9yZURlY2lzaW9uKTsKIAorICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihudWxscHRyKTsK ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCkBAIC00MDYsNyArNDA3LDcgQEAgc3Rk Ojp1bmlxdWVfcHRyPEVudHJ5PiBDYWNoZTo6c3RvcmUoY29ucwogICAgICAgICAgICAgbWFwcGVk Qm9keS5zaGFyZWFibGVSZXNvdXJjZS0+Y3JlYXRlSGFuZGxlKG1hcHBlZEJvZHkuc2hhcmVhYmxl UmVzb3VyY2VIYW5kbGUpOwogICAgICAgICB9CiAjZW5kaWYKLSAgICAgICAgY29tcGxldGlvbkhh bmRsZXIobWFwcGVkQm9keSk7CisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCZtYXBwZWRCb2R5 KTsKICAgICAgICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3JrUHJvY2Vzcykgc3RvcmVkIik7 CiAgICAgfSk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0 d29ya0NhY2hlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGUuaAkocmV2aXNpb24gMjM5NzEwKQorKysgU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuaAkod29ya2luZyBjb3B5KQpAQCAtMTEz LDcgKzExMyw3IEBAIHB1YmxpYzoKICAgICB9OwogICAgIHVzaW5nIFJldHJpZXZlQ29tcGxldGlv bkhhbmRsZXIgPSBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKHN0ZDo6dW5pcXVlX3B0cjxFbnRyeT4s IGNvbnN0IFJldHJpZXZlSW5mbyYpPjsKICAgICB2b2lkIHJldHJpZXZlKGNvbnN0IFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IEdsb2JhbEZyYW1lSUQmLCBSZXRyaWV2ZUNvbXBsZXRp b25IYW5kbGVyJiYpOwotICAgIHN0ZDo6dW5pcXVlX3B0cjxFbnRyeT4gc3RvcmUoY29uc3QgV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYs IFJlZlB0cjxXZWJDb3JlOjpTaGFyZWRCdWZmZXI+JiYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo TWFwcGVkQm9keSYpPiYmKTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RW50cnk+IHN0b3JlKGNvbnN0 IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9u c2UmLCBSZWZQdHI8V2ViQ29yZTo6U2hhcmVkQnVmZmVyPiYmLCBDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKE1hcHBlZEJvZHkqKT4mJik7CiAgICAgc3RkOjp1bmlxdWVfcHRyPEVudHJ5PiBzdG9yZVJl ZGlyZWN0KGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFdlYkNvcmU6OlJl c291cmNlUmVzcG9uc2UmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlZGlyZWN0 UmVxdWVzdCwgT3B0aW9uYWw8U2Vjb25kcz4gbWF4QWdlQ2FwKTsKICAgICBzdGQ6OnVuaXF1ZV9w dHI8RW50cnk+IHVwZGF0ZShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBH bG9iYWxGcmFtZUlEJiwgY29uc3QgRW50cnkmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlJiB2YWxpZGF0aW5nUmVzcG9uc2UpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxh dGl2ZUxvYWQuY3BwCShyZXZpc2lvbiAyMzk2NzApCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEyMSw3ICsxMjEsNyBAQCB2b2lkIFNwZWN1bGF0aXZlTG9hZDo6ZGlkRmluaXNoTG9h ZGluZyhjCiAgICAgaWYgKG1fZGlkQ29tcGxldGUpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAo IW1fY2FjaGVFbnRyeSAmJiBtX2J1ZmZlcmVkRGF0YUZvckNhY2hlKSB7Ci0gICAgICAgIG1fY2Fj aGVFbnRyeSA9IG1fY2FjaGUtPnN0b3JlKG1fb3JpZ2luYWxSZXF1ZXN0LCBtX3Jlc3BvbnNlLCBt X2J1ZmZlcmVkRGF0YUZvckNhY2hlLmNvcHlSZWYoKSwgW10oYXV0byYgbWFwcGVkQm9keSkgeyB9 KTsKKyAgICAgICAgbV9jYWNoZUVudHJ5ID0gbV9jYWNoZS0+c3RvcmUobV9vcmlnaW5hbFJlcXVl c3QsIG1fcmVzcG9uc2UsIG1fYnVmZmVyZWREYXRhRm9yQ2FjaGUuY29weVJlZigpLCBbXShhdXRv KiBtYXBwZWRCb2R5KSB7IH0pOwogICAgICAgICAvLyBDcmVhdGUgYSBzeW50aGV0aWMgY2FjaGUg ZW50cnkgaWYgd2UgY2FuJ3Qgc3RvcmUuCiAgICAgICAgIGlmICghbV9jYWNoZUVudHJ5ICYmIGlz U3RhdHVzQ29kZUNhY2hlYWJsZUJ5RGVmYXVsdChtX3Jlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkp KQogICAgICAgICAgICAgbV9jYWNoZUVudHJ5ID0gbV9jYWNoZS0+bWFrZUVudHJ5KG1fb3JpZ2lu YWxSZXF1ZXN0LCBtX3Jlc3BvbnNlLCBXVEZNb3ZlKG1fYnVmZmVyZWREYXRhRm9yQ2FjaGUpKTsK SW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3Rv cmFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcAkocmV2aXNpb24gMjM5NjcwKQorKysgU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtODg0LDggKzg4NCwxMCBAQCB2b2lkIFN0b3JhZ2U6OnN0b3JlKGNvbnN0IFJl Y29yZCYgcmVjb3JkCiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKICAgICBBU1NFUlQo IXJlY29yZC5rZXkuaXNOdWxsKCkpOwogCi0gICAgaWYgKCFtX2NhcGFjaXR5KQorICAgIGlmICgh bV9jYXBhY2l0eSkgeworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigwKTsKICAgICAgICAgcmV0 dXJuOworICAgIH0KIAogICAgIGF1dG8gd3JpdGVPcGVyYXRpb24gPSBzdGQ6Om1ha2VfdW5pcXVl PFdyaXRlT3BlcmF0aW9uPigqdGhpcywgcmVjb3JkLCBXVEZNb3ZlKG1hcHBlZEJvZHlIYW5kbGVy KSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogICAgIG1fcGVuZGluZ1dyaXRlT3BlcmF0 aW9ucy5wcmVwZW5kKFdURk1vdmUod3JpdGVPcGVyYXRpb24pKTsK