146184 2015-06-20 14:15:25 -0700 [SOUP] Use GTask in WebKitSoupRequestInputStream 2015-06-21 06:20:08 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=146181 https://bugs.webkit.org/show_bug.cgi?id=117149 P2 Enhancement --- 1 mcatanzaro mcatanzaro cgarcia commit-queue mcatanzaro oldest_to_newest 1103655 0 mcatanzaro 2015-06-20 14:15:25 -0700 Replace use of GSimpleAsyncResult with GTask in WebKitSoupRequestInputStream. 1103656 1 255298 mcatanzaro 2015-06-20 14:21:07 -0700 Created attachment 255298 Patch 1103709 2 255298 cgarcia 2015-06-21 02:29:03 -0700 Comment on attachment 255298 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=255298&action=review > Source/WebKit2/WebProcess/soup/WebKitSoupRequestInputStream.cpp:85 > + GRefPtr<GTask> task = adoptGRef(g_task_new(G_OBJECT(stream), cancellable, callback, userData)); g_task_new expects a gpointer so we don't need the G_OBJECT cast. 1103722 3 255323 mcatanzaro 2015-06-21 05:23:36 -0700 Created attachment 255323 Patch 1103727 4 255323 commit-queue 2015-06-21 06:20:05 -0700 Comment on attachment 255323 Patch Clearing flags on attachment: 255323 Committed r185808: <http://trac.webkit.org/changeset/185808> 1103728 5 commit-queue 2015-06-21 06:20:08 -0700 All reviewed patches have been landed. Closing bug. 255298 2015-06-20 14:21:07 -0700 2015-06-21 05:23:33 -0700 Patch bug-146184-20150620162027.patch text/plain 6035 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1Nzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2FhNjgwY2U0ZmMwNmY3 YWRjODQxMmY0Nzg1ZTM3MGRmZTg4NDIwMS4uMmJjZDcyYjgxMzM5NDY2YmY1NGQxZDY0MzA5YjEw MDk3Zjc3OWY5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA2LTIwICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBbU09VUF0g VXNlIEdUYXNrIGluIFdlYktpdFNvdXBSZXF1ZXN0SW5wdXRTdHJlYW0KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjE4NAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcGxhY2UgZGVwcmVjYXRlZCB1c2Ug b2YgR1NpbXBsZUFzeW5jUmVzdWx0IHdpdGggR1Rhc2suCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L3NvdXAvV2ViS2l0U291cFJlcXVlc3RJbnB1dFN0cmVhbS5jcHA6CisgICAgICAgIChBc3luY1Jl YWREYXRhOjpBc3luY1JlYWREYXRhKToKKyAgICAgICAgKHdlYmtpdFNvdXBSZXF1ZXN0SW5wdXRT dHJlYW1SZWFkQXN5bmNSZXN1bHRDb21wbGV0ZSk6CisgICAgICAgICh3ZWJraXRTb3VwUmVxdWVz dElucHV0U3RyZWFtUGVuZGluZ1JlYWRBc3luY0NvbXBsZXRlKToKKyAgICAgICAgKHdlYmtpdFNv dXBSZXF1ZXN0SW5wdXRTdHJlYW1SZWFkQXN5bmMpOgorICAgICAgICAod2Via2l0U291cFJlcXVl c3RJbnB1dFN0cmVhbVJlYWRGaW5pc2gpOgorCiAyMDE1LTA2LTIwICBEYW4gQmVybnN0ZWluICA8 bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkZWQgYXZhaWxhYmlsaXR5IGluZm9ybWF0aW9u IHRvIGEgcmVjZW50bHktYWRkZWQgZGVsZWdhdGUgbWV0aG9kLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9zb3VwL1dlYktpdFNvdXBSZXF1ZXN0SW5wdXRTdHJlYW0uY3Bw IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9zb3VwL1dlYktpdFNvdXBSZXF1ZXN0SW5wdXRT dHJlYW0uY3BwCmluZGV4IDc5NGE0YmQ2NWM2N2EyNTdiMWY5NGMwZWQ4MDNkYjc0NWJmMGVjMmIu LjhhY2ExM2Y3Zjk2YzgyOGYyNjQxYjBmNjVmNWM0Nzk2MzZlZmEyODYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mvc291cC9XZWJLaXRTb3VwUmVxdWVzdElucHV0U3RyZWFt LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3NvdXAvV2ViS2l0U291cFJlcXVl c3RJbnB1dFN0cmVhbS5jcHAKQEAgLTI0LDE4ICsyNCwxNiBAQAogI2luY2x1ZGUgPHd0Zi9nbGli L0dSZWZQdHIuaD4KIAogc3RydWN0IEFzeW5jUmVhZERhdGEgewotICAgIEFzeW5jUmVhZERhdGEo R1NpbXBsZUFzeW5jUmVzdWx0KiByZXN1bHQsIHZvaWQqIGJ1ZmZlciwgZ3NpemUgY291bnQsIEdD YW5jZWxsYWJsZSogY2FuY2VsbGFibGUpCi0gICAgICAgIDogcmVzdWx0KHJlc3VsdCkKKyAgICBB c3luY1JlYWREYXRhKEdUYXNrKiB0YXNrLCB2b2lkKiBidWZmZXIsIGdzaXplIGNvdW50KQorICAg ICAgICA6IHRhc2sodGFzaykKICAgICAgICAgLCBidWZmZXIoYnVmZmVyKQogICAgICAgICAsIGNv dW50KGNvdW50KQotICAgICAgICAsIGNhbmNlbGxhYmxlKGNhbmNlbGxhYmxlKQogICAgIHsKICAg ICB9CiAKLSAgICBHUmVmUHRyPEdTaW1wbGVBc3luY1Jlc3VsdD4gcmVzdWx0OworICAgIEdSZWZQ dHI8R1Rhc2s+IHRhc2s7CiAgICAgdm9pZCogYnVmZmVyOwogICAgIHNpemVfdCBjb3VudDsKLSAg ICBHUmVmUHRyPEdDYW5jZWxsYWJsZT4gY2FuY2VsbGFibGU7CiB9OwogCiBzdHJ1Y3QgX1dlYktp dFNvdXBSZXF1ZXN0SW5wdXRTdHJlYW1Qcml2YXRlIHsKQEAgLTQ5LDE2ICs0NywxNiBAQCBzdHJ1 Y3QgX1dlYktpdFNvdXBSZXF1ZXN0SW5wdXRTdHJlYW1Qcml2YXRlIHsKIAogR19ERUZJTkVfVFlQ RShXZWJLaXRTb3VwUmVxdWVzdElucHV0U3RyZWFtLCB3ZWJraXRfc291cF9yZXF1ZXN0X2lucHV0 X3N0cmVhbSwgR19UWVBFX01FTU9SWV9JTlBVVF9TVFJFQU0pCiAKLXN0YXRpYyB2b2lkIHdlYmtp dFNvdXBSZXF1ZXN0SW5wdXRTdHJlYW1SZWFkQXN5bmNSZXN1bHRDb21wbGV0ZShXZWJLaXRTb3Vw UmVxdWVzdElucHV0U3RyZWFtKiBzdHJlYW0sIEdTaW1wbGVBc3luY1Jlc3VsdCogcmVzdWx0LCB2 b2lkKiBidWZmZXIsIGdzaXplIGNvdW50LCBHQ2FuY2VsbGFibGUqIGNhbmNlbGxhYmxlKQorc3Rh dGljIHZvaWQgd2Via2l0U291cFJlcXVlc3RJbnB1dFN0cmVhbVJlYWRBc3luY1Jlc3VsdENvbXBs ZXRlKEdUYXNrKiB0YXNrLCB2b2lkKiBidWZmZXIsIGdzaXplIGNvdW50KQogewotICAgIEdFcnJv ciogZXJyb3IgPSAwOwotICAgIGdzc2l6ZSBieXRlc1JlYWQgPSBHX0lOUFVUX1NUUkVBTV9HRVRf Q0xBU1Moc3RyZWFtKS0+cmVhZF9mbihHX0lOUFVUX1NUUkVBTShzdHJlYW0pLCBidWZmZXIsIGNv dW50LCBjYW5jZWxsYWJsZSwgJmVycm9yKTsKKyAgICBXZWJLaXRTb3VwUmVxdWVzdElucHV0U3Ry ZWFtKiBzdHJlYW0gPSBXRUJLSVRfU09VUF9SRVFVRVNUX0lOUFVUX1NUUkVBTShnX3Rhc2tfZ2V0 X3NvdXJjZV9vYmplY3QodGFzaykpOworICAgIEdFcnJvciogZXJyb3IgPSBudWxscHRyOworICAg IGdzc2l6ZSBieXRlc1JlYWQgPSBHX0lOUFVUX1NUUkVBTV9HRVRfQ0xBU1Moc3RyZWFtKS0+cmVh ZF9mbihHX0lOUFVUX1NUUkVBTShzdHJlYW0pLCBidWZmZXIsIGNvdW50LCBnX3Rhc2tfZ2V0X2Nh bmNlbGxhYmxlKHRhc2spLCAmZXJyb3IpOwogICAgIGlmICghZXJyb3IpIHsKLSAgICAgICAgZ19z aW1wbGVfYXN5bmNfcmVzdWx0X3NldF9vcF9yZXNfZ3NzaXplKHJlc3VsdCwgYnl0ZXNSZWFkKTsK ICAgICAgICAgc3RyZWFtLT5wcml2LT5ieXRlc1JlYWQgKz0gYnl0ZXNSZWFkOworICAgICAgICBn X3Rhc2tfcmV0dXJuX2ludCh0YXNrLCBieXRlc1JlYWQpOwogICAgIH0gZWxzZQotICAgICAgICBn X3NpbXBsZV9hc3luY19yZXN1bHRfdGFrZV9lcnJvcihyZXN1bHQsIGVycm9yKTsKLSAgICBnX3Np bXBsZV9hc3luY19yZXN1bHRfY29tcGxldGVfaW5faWRsZShyZXN1bHQpOworICAgICAgICBnX3Rh c2tfcmV0dXJuX2Vycm9yKHRhc2ssIGVycm9yKTsKIH0KIAogc3RhdGljIHZvaWQgd2Via2l0U291 cFJlcXVlc3RJbnB1dFN0cmVhbVBlbmRpbmdSZWFkQXN5bmNDb21wbGV0ZShXZWJLaXRTb3VwUmVx dWVzdElucHV0U3RyZWFtKiBzdHJlYW0pCkBAIC02Nyw3ICs2NSw3IEBAIHN0YXRpYyB2b2lkIHdl YmtpdFNvdXBSZXF1ZXN0SW5wdXRTdHJlYW1QZW5kaW5nUmVhZEFzeW5jQ29tcGxldGUoV2ViS2l0 U291cFJlcXVlCiAgICAgICAgIHJldHVybjsKIAogICAgIEFzeW5jUmVhZERhdGEqIGRhdGEgPSBz dHJlYW0tPnByaXYtPnBlbmRpbmdBc3luY1JlYWQuZ2V0KCk7Ci0gICAgd2Via2l0U291cFJlcXVl c3RJbnB1dFN0cmVhbVJlYWRBc3luY1Jlc3VsdENvbXBsZXRlKHN0cmVhbSwgZGF0YS0+cmVzdWx0 LmdldCgpLCBkYXRhLT5idWZmZXIsIGRhdGEtPmNvdW50LCBkYXRhLT5jYW5jZWxsYWJsZS5nZXQo KSk7CisgICAgd2Via2l0U291cFJlcXVlc3RJbnB1dFN0cmVhbVJlYWRBc3luY1Jlc3VsdENvbXBs ZXRlKGRhdGEtPnRhc2suZ2V0KCksIGRhdGEtPmJ1ZmZlciwgZGF0YS0+Y291bnQpOwogICAgIHN0 cmVhbS0+cHJpdi0+cGVuZGluZ0FzeW5jUmVhZCA9IG51bGxwdHI7CiB9CiAKQEAgLTg0LDMwICs4 MiwyOCBAQCBzdGF0aWMgYm9vbCB3ZWJraXRTb3VwUmVxdWVzdElucHV0U3RyZWFtSXNXYWl0aW5n Rm9yRGF0YShXZWJLaXRTb3VwUmVxdWVzdElucHV0Uwogc3RhdGljIHZvaWQgd2Via2l0U291cFJl cXVlc3RJbnB1dFN0cmVhbVJlYWRBc3luYyhHSW5wdXRTdHJlYW0qIGlucHV0U3RyZWFtLCB2b2lk KiBidWZmZXIsIGdzaXplIGNvdW50LCBpbnQgLypwcmlvcml0eSovLCBHQ2FuY2VsbGFibGUqIGNh bmNlbGxhYmxlLCBHQXN5bmNSZWFkeUNhbGxiYWNrIGNhbGxiYWNrLCBncG9pbnRlciB1c2VyRGF0 YSkKIHsKICAgICBXZWJLaXRTb3VwUmVxdWVzdElucHV0U3RyZWFtKiBzdHJlYW0gPSBXRUJLSVRf U09VUF9SRVFVRVNUX0lOUFVUX1NUUkVBTShpbnB1dFN0cmVhbSk7Ci0gICAgR1JlZlB0cjxHU2lt cGxlQXN5bmNSZXN1bHQ+IHJlc3VsdCA9IGFkb3B0R1JlZihnX3NpbXBsZV9hc3luY19yZXN1bHRf bmV3KEdfT0JKRUNUKHN0cmVhbSksIGNhbGxiYWNrLCB1c2VyRGF0YSwgcmVpbnRlcnByZXRfY2Fz dDx2b2lkKj4od2Via2l0U291cFJlcXVlc3RJbnB1dFN0cmVhbVJlYWRBc3luYykpKTsKKyAgICBH UmVmUHRyPEdUYXNrPiB0YXNrID0gYWRvcHRHUmVmKGdfdGFza19uZXcoR19PQkpFQ1Qoc3RyZWFt KSwgY2FuY2VsbGFibGUsIGNhbGxiYWNrLCB1c2VyRGF0YSkpOwogCiAgICAgTXV0ZXhMb2NrZXIg bG9ja2VyKHN0cmVhbS0+cHJpdi0+cmVhZExvY2spOwogCiAgICAgaWYgKCF3ZWJraXRTb3VwUmVx dWVzdElucHV0U3RyZWFtSGFzRGF0YVRvUmVhZChzdHJlYW0pICYmICF3ZWJraXRTb3VwUmVxdWVz dElucHV0U3RyZWFtSXNXYWl0aW5nRm9yRGF0YShzdHJlYW0pKSB7Ci0gICAgICAgIGdfc2ltcGxl X2FzeW5jX3Jlc3VsdF9zZXRfb3BfcmVzX2dzc2l6ZShyZXN1bHQuZ2V0KCksIDApOwotICAgICAg ICBnX3NpbXBsZV9hc3luY19yZXN1bHRfY29tcGxldGVfaW5faWRsZShyZXN1bHQuZ2V0KCkpOwor ICAgICAgICBnX3Rhc2tfcmV0dXJuX2ludCh0YXNrLmdldCgpLCAwKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KIAogICAgIGlmICh3ZWJraXRTb3VwUmVxdWVzdElucHV0U3RyZWFtSGFzRGF0YVRv UmVhZChzdHJlYW0pKSB7Ci0gICAgICAgIHdlYmtpdFNvdXBSZXF1ZXN0SW5wdXRTdHJlYW1SZWFk QXN5bmNSZXN1bHRDb21wbGV0ZShzdHJlYW0sIHJlc3VsdC5nZXQoKSwgYnVmZmVyLCBjb3VudCwg Y2FuY2VsbGFibGUpOworICAgICAgICB3ZWJraXRTb3VwUmVxdWVzdElucHV0U3RyZWFtUmVhZEFz eW5jUmVzdWx0Q29tcGxldGUodGFzay5nZXQoKSwgYnVmZmVyLCBjb3VudCk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKLSAgICBzdHJlYW0tPnByaXYtPnBlbmRpbmdBc3luY1JlYWQgPSBzdGQ6 Om1ha2VfdW5pcXVlPEFzeW5jUmVhZERhdGE+KHJlc3VsdC5nZXQoKSwgYnVmZmVyLCBjb3VudCwg Y2FuY2VsbGFibGUpOworICAgIHN0cmVhbS0+cHJpdi0+cGVuZGluZ0FzeW5jUmVhZCA9IHN0ZDo6 bWFrZV91bmlxdWU8QXN5bmNSZWFkRGF0YT4odGFzay5nZXQoKSwgYnVmZmVyLCBjb3VudCk7CiB9 CiAKLXN0YXRpYyBnc3NpemUgd2Via2l0U291cFJlcXVlc3RJbnB1dFN0cmVhbVJlYWRGaW5pc2go R0lucHV0U3RyZWFtKiwgR0FzeW5jUmVzdWx0KiByZXN1bHQsIEdFcnJvcioqKQorc3RhdGljIGdz c2l6ZSB3ZWJraXRTb3VwUmVxdWVzdElucHV0U3RyZWFtUmVhZEZpbmlzaChHSW5wdXRTdHJlYW0q IGlucHV0U3RyZWFtLCBHQXN5bmNSZXN1bHQqIHJlc3VsdCwgR0Vycm9yKiogZXJyb3IpCiB7Ci0g ICAgR1NpbXBsZUFzeW5jUmVzdWx0KiBzaW1wbGVSZXN1bHQgPSBHX1NJTVBMRV9BU1lOQ19SRVNV TFQocmVzdWx0KTsKLSAgICBnX3dhcm5faWZfZmFpbChnX3NpbXBsZV9hc3luY19yZXN1bHRfZ2V0 X3NvdXJjZV90YWcoc2ltcGxlUmVzdWx0KSA9PSB3ZWJraXRTb3VwUmVxdWVzdElucHV0U3RyZWFt UmVhZEFzeW5jKTsKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChnX3Rhc2tfaXNfdmFsaWQocmVz dWx0LCBpbnB1dFN0cmVhbSksIDApOwogCi0gICAgcmV0dXJuIGdfc2ltcGxlX2FzeW5jX3Jlc3Vs dF9nZXRfb3BfcmVzX2dzc2l6ZShzaW1wbGVSZXN1bHQpOworICAgIHJldHVybiBnX3Rhc2tfcHJv cGFnYXRlX2ludChHX1RBU0socmVzdWx0KSwgZXJyb3IpOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJr aXRTb3VwUmVxdWVzdElucHV0U3RyZWFtRmluYWxpemUoR09iamVjdCogb2JqZWN0KQo= 255323 2015-06-21 05:23:36 -0700 2015-06-21 06:20:05 -0700 Patch bug-146184-20150621072255.patch text/plain 6039 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1ODA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzA0OWFmOTliZGViMmFm MDQ0NWNjM2RmM2IwYTZjODZmNThjMzVlMi4uZWI4MzQ0MmQ3MTI1ZjViYWEwMDc0Mzk2ODQwOGFl NzZmMGMxMTFlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA2LTIxICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBbU09VUF0g VXNlIEdUYXNrIGluIFdlYktpdFNvdXBSZXF1ZXN0SW5wdXRTdHJlYW0KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjE4NAorCisgICAgICAgIFJldmll d2VkIGJ5IENhcmxvcyBHYXJjaWEgQ2FtcG9zLgorCisgICAgICAgIFJlcGxhY2UgZGVwcmVjYXRl ZCB1c2Ugb2YgR1NpbXBsZUFzeW5jUmVzdWx0IHdpdGggR1Rhc2suCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL3NvdXAvV2ViS2l0U291cFJlcXVlc3RJbnB1dFN0cmVhbS5jcHA6CisgICAgICAgIChB c3luY1JlYWREYXRhOjpBc3luY1JlYWREYXRhKToKKyAgICAgICAgKHdlYmtpdFNvdXBSZXF1ZXN0 SW5wdXRTdHJlYW1SZWFkQXN5bmNSZXN1bHRDb21wbGV0ZSk6CisgICAgICAgICh3ZWJraXRTb3Vw UmVxdWVzdElucHV0U3RyZWFtUGVuZGluZ1JlYWRBc3luY0NvbXBsZXRlKToKKyAgICAgICAgKHdl YmtpdFNvdXBSZXF1ZXN0SW5wdXRTdHJlYW1SZWFkQXN5bmMpOgorICAgICAgICAod2Via2l0U291 cFJlcXVlc3RJbnB1dFN0cmVhbVJlYWRGaW5pc2gpOgorCiAyMDE1LTA2LTIwICBUaW0gSG9ydG9u ICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIERlc2VsZWN0aW9uIG9mIHRl eHQgY2F1c2VzIGEgbm90aWNlYWJsZSBqdW1wIG9uIGZvcmNlIHRvdWNoIG1hY2hpbmVzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3NvdXAvV2ViS2l0U291cFJlcXVlc3RJ bnB1dFN0cmVhbS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3NvdXAvV2ViS2l0U291 cFJlcXVlc3RJbnB1dFN0cmVhbS5jcHAKaW5kZXggNzk0YTRiZDY1YzY3YTI1N2IxZjk0YzBlZDgw M2RiNzQ1YmYwZWMyYi4uMDQ0MDllMThlNTk2MjM3NWY3MGYzYTkxNDdhNzMxZWQ4MmNmZDA1NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9zb3VwL1dlYktpdFNvdXBSZXF1 ZXN0SW5wdXRTdHJlYW0uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mvc291cC9X ZWJLaXRTb3VwUmVxdWVzdElucHV0U3RyZWFtLmNwcApAQCAtMjQsMTggKzI0LDE2IEBACiAjaW5j bHVkZSA8d3RmL2dsaWIvR1JlZlB0ci5oPgogCiBzdHJ1Y3QgQXN5bmNSZWFkRGF0YSB7Ci0gICAg QXN5bmNSZWFkRGF0YShHU2ltcGxlQXN5bmNSZXN1bHQqIHJlc3VsdCwgdm9pZCogYnVmZmVyLCBn c2l6ZSBjb3VudCwgR0NhbmNlbGxhYmxlKiBjYW5jZWxsYWJsZSkKLSAgICAgICAgOiByZXN1bHQo cmVzdWx0KQorICAgIEFzeW5jUmVhZERhdGEoR1Rhc2sqIHRhc2ssIHZvaWQqIGJ1ZmZlciwgZ3Np emUgY291bnQpCisgICAgICAgIDogdGFzayh0YXNrKQogICAgICAgICAsIGJ1ZmZlcihidWZmZXIp CiAgICAgICAgICwgY291bnQoY291bnQpCi0gICAgICAgICwgY2FuY2VsbGFibGUoY2FuY2VsbGFi bGUpCiAgICAgewogICAgIH0KIAotICAgIEdSZWZQdHI8R1NpbXBsZUFzeW5jUmVzdWx0PiByZXN1 bHQ7CisgICAgR1JlZlB0cjxHVGFzaz4gdGFzazsKICAgICB2b2lkKiBidWZmZXI7CiAgICAgc2l6 ZV90IGNvdW50OwotICAgIEdSZWZQdHI8R0NhbmNlbGxhYmxlPiBjYW5jZWxsYWJsZTsKIH07CiAK IHN0cnVjdCBfV2ViS2l0U291cFJlcXVlc3RJbnB1dFN0cmVhbVByaXZhdGUgewpAQCAtNDksMTYg KzQ3LDE2IEBAIHN0cnVjdCBfV2ViS2l0U291cFJlcXVlc3RJbnB1dFN0cmVhbVByaXZhdGUgewog CiBHX0RFRklORV9UWVBFKFdlYktpdFNvdXBSZXF1ZXN0SW5wdXRTdHJlYW0sIHdlYmtpdF9zb3Vw X3JlcXVlc3RfaW5wdXRfc3RyZWFtLCBHX1RZUEVfTUVNT1JZX0lOUFVUX1NUUkVBTSkKIAotc3Rh dGljIHZvaWQgd2Via2l0U291cFJlcXVlc3RJbnB1dFN0cmVhbVJlYWRBc3luY1Jlc3VsdENvbXBs ZXRlKFdlYktpdFNvdXBSZXF1ZXN0SW5wdXRTdHJlYW0qIHN0cmVhbSwgR1NpbXBsZUFzeW5jUmVz dWx0KiByZXN1bHQsIHZvaWQqIGJ1ZmZlciwgZ3NpemUgY291bnQsIEdDYW5jZWxsYWJsZSogY2Fu Y2VsbGFibGUpCitzdGF0aWMgdm9pZCB3ZWJraXRTb3VwUmVxdWVzdElucHV0U3RyZWFtUmVhZEFz eW5jUmVzdWx0Q29tcGxldGUoR1Rhc2sqIHRhc2ssIHZvaWQqIGJ1ZmZlciwgZ3NpemUgY291bnQp CiB7Ci0gICAgR0Vycm9yKiBlcnJvciA9IDA7Ci0gICAgZ3NzaXplIGJ5dGVzUmVhZCA9IEdfSU5Q VVRfU1RSRUFNX0dFVF9DTEFTUyhzdHJlYW0pLT5yZWFkX2ZuKEdfSU5QVVRfU1RSRUFNKHN0cmVh bSksIGJ1ZmZlciwgY291bnQsIGNhbmNlbGxhYmxlLCAmZXJyb3IpOworICAgIFdlYktpdFNvdXBS ZXF1ZXN0SW5wdXRTdHJlYW0qIHN0cmVhbSA9IFdFQktJVF9TT1VQX1JFUVVFU1RfSU5QVVRfU1RS RUFNKGdfdGFza19nZXRfc291cmNlX29iamVjdCh0YXNrKSk7CisgICAgR0Vycm9yKiBlcnJvciA9 IG51bGxwdHI7CisgICAgZ3NzaXplIGJ5dGVzUmVhZCA9IEdfSU5QVVRfU1RSRUFNX0dFVF9DTEFT UyhzdHJlYW0pLT5yZWFkX2ZuKEdfSU5QVVRfU1RSRUFNKHN0cmVhbSksIGJ1ZmZlciwgY291bnQs IGdfdGFza19nZXRfY2FuY2VsbGFibGUodGFzayksICZlcnJvcik7CiAgICAgaWYgKCFlcnJvcikg ewotICAgICAgICBnX3NpbXBsZV9hc3luY19yZXN1bHRfc2V0X29wX3Jlc19nc3NpemUocmVzdWx0 LCBieXRlc1JlYWQpOwogICAgICAgICBzdHJlYW0tPnByaXYtPmJ5dGVzUmVhZCArPSBieXRlc1Jl YWQ7CisgICAgICAgIGdfdGFza19yZXR1cm5faW50KHRhc2ssIGJ5dGVzUmVhZCk7CiAgICAgfSBl bHNlCi0gICAgICAgIGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF90YWtlX2Vycm9yKHJlc3VsdCwgZXJy b3IpOwotICAgIGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9jb21wbGV0ZV9pbl9pZGxlKHJlc3VsdCk7 CisgICAgICAgIGdfdGFza19yZXR1cm5fZXJyb3IodGFzaywgZXJyb3IpOwogfQogCiBzdGF0aWMg dm9pZCB3ZWJraXRTb3VwUmVxdWVzdElucHV0U3RyZWFtUGVuZGluZ1JlYWRBc3luY0NvbXBsZXRl KFdlYktpdFNvdXBSZXF1ZXN0SW5wdXRTdHJlYW0qIHN0cmVhbSkKQEAgLTY3LDcgKzY1LDcgQEAg c3RhdGljIHZvaWQgd2Via2l0U291cFJlcXVlc3RJbnB1dFN0cmVhbVBlbmRpbmdSZWFkQXN5bmND b21wbGV0ZShXZWJLaXRTb3VwUmVxdWUKICAgICAgICAgcmV0dXJuOwogCiAgICAgQXN5bmNSZWFk RGF0YSogZGF0YSA9IHN0cmVhbS0+cHJpdi0+cGVuZGluZ0FzeW5jUmVhZC5nZXQoKTsKLSAgICB3 ZWJraXRTb3VwUmVxdWVzdElucHV0U3RyZWFtUmVhZEFzeW5jUmVzdWx0Q29tcGxldGUoc3RyZWFt LCBkYXRhLT5yZXN1bHQuZ2V0KCksIGRhdGEtPmJ1ZmZlciwgZGF0YS0+Y291bnQsIGRhdGEtPmNh bmNlbGxhYmxlLmdldCgpKTsKKyAgICB3ZWJraXRTb3VwUmVxdWVzdElucHV0U3RyZWFtUmVhZEFz eW5jUmVzdWx0Q29tcGxldGUoZGF0YS0+dGFzay5nZXQoKSwgZGF0YS0+YnVmZmVyLCBkYXRhLT5j b3VudCk7CiAgICAgc3RyZWFtLT5wcml2LT5wZW5kaW5nQXN5bmNSZWFkID0gbnVsbHB0cjsKIH0K IApAQCAtODQsMzAgKzgyLDI4IEBAIHN0YXRpYyBib29sIHdlYmtpdFNvdXBSZXF1ZXN0SW5wdXRT dHJlYW1Jc1dhaXRpbmdGb3JEYXRhKFdlYktpdFNvdXBSZXF1ZXN0SW5wdXRTCiBzdGF0aWMgdm9p ZCB3ZWJraXRTb3VwUmVxdWVzdElucHV0U3RyZWFtUmVhZEFzeW5jKEdJbnB1dFN0cmVhbSogaW5w dXRTdHJlYW0sIHZvaWQqIGJ1ZmZlciwgZ3NpemUgY291bnQsIGludCAvKnByaW9yaXR5Ki8sIEdD YW5jZWxsYWJsZSogY2FuY2VsbGFibGUsIEdBc3luY1JlYWR5Q2FsbGJhY2sgY2FsbGJhY2ssIGdw b2ludGVyIHVzZXJEYXRhKQogewogICAgIFdlYktpdFNvdXBSZXF1ZXN0SW5wdXRTdHJlYW0qIHN0 cmVhbSA9IFdFQktJVF9TT1VQX1JFUVVFU1RfSU5QVVRfU1RSRUFNKGlucHV0U3RyZWFtKTsKLSAg ICBHUmVmUHRyPEdTaW1wbGVBc3luY1Jlc3VsdD4gcmVzdWx0ID0gYWRvcHRHUmVmKGdfc2ltcGxl X2FzeW5jX3Jlc3VsdF9uZXcoR19PQkpFQ1Qoc3RyZWFtKSwgY2FsbGJhY2ssIHVzZXJEYXRhLCBy ZWludGVycHJldF9jYXN0PHZvaWQqPih3ZWJraXRTb3VwUmVxdWVzdElucHV0U3RyZWFtUmVhZEFz eW5jKSkpOworICAgIEdSZWZQdHI8R1Rhc2s+IHRhc2sgPSBhZG9wdEdSZWYoZ190YXNrX25ldyhz dHJlYW0sIGNhbmNlbGxhYmxlLCBjYWxsYmFjaywgdXNlckRhdGEpKTsKIAogICAgIE11dGV4TG9j a2VyIGxvY2tlcihzdHJlYW0tPnByaXYtPnJlYWRMb2NrKTsKIAogICAgIGlmICghd2Via2l0U291 cFJlcXVlc3RJbnB1dFN0cmVhbUhhc0RhdGFUb1JlYWQoc3RyZWFtKSAmJiAhd2Via2l0U291cFJl cXVlc3RJbnB1dFN0cmVhbUlzV2FpdGluZ0ZvckRhdGEoc3RyZWFtKSkgewotICAgICAgICBnX3Np bXBsZV9hc3luY19yZXN1bHRfc2V0X29wX3Jlc19nc3NpemUocmVzdWx0LmdldCgpLCAwKTsKLSAg ICAgICAgZ19zaW1wbGVfYXN5bmNfcmVzdWx0X2NvbXBsZXRlX2luX2lkbGUocmVzdWx0LmdldCgp KTsKKyAgICAgICAgZ190YXNrX3JldHVybl9pbnQodGFzay5nZXQoKSwgMCk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKICAgICBpZiAod2Via2l0U291cFJlcXVlc3RJbnB1dFN0cmVhbUhhc0Rh dGFUb1JlYWQoc3RyZWFtKSkgewotICAgICAgICB3ZWJraXRTb3VwUmVxdWVzdElucHV0U3RyZWFt UmVhZEFzeW5jUmVzdWx0Q29tcGxldGUoc3RyZWFtLCByZXN1bHQuZ2V0KCksIGJ1ZmZlciwgY291 bnQsIGNhbmNlbGxhYmxlKTsKKyAgICAgICAgd2Via2l0U291cFJlcXVlc3RJbnB1dFN0cmVhbVJl YWRBc3luY1Jlc3VsdENvbXBsZXRlKHRhc2suZ2V0KCksIGJ1ZmZlciwgY291bnQpOwogICAgICAg ICByZXR1cm47CiAgICAgfQogCi0gICAgc3RyZWFtLT5wcml2LT5wZW5kaW5nQXN5bmNSZWFkID0g c3RkOjptYWtlX3VuaXF1ZTxBc3luY1JlYWREYXRhPihyZXN1bHQuZ2V0KCksIGJ1ZmZlciwgY291 bnQsIGNhbmNlbGxhYmxlKTsKKyAgICBzdHJlYW0tPnByaXYtPnBlbmRpbmdBc3luY1JlYWQgPSBz dGQ6Om1ha2VfdW5pcXVlPEFzeW5jUmVhZERhdGE+KHRhc2suZ2V0KCksIGJ1ZmZlciwgY291bnQp OwogfQogCi1zdGF0aWMgZ3NzaXplIHdlYmtpdFNvdXBSZXF1ZXN0SW5wdXRTdHJlYW1SZWFkRmlu aXNoKEdJbnB1dFN0cmVhbSosIEdBc3luY1Jlc3VsdCogcmVzdWx0LCBHRXJyb3IqKikKK3N0YXRp YyBnc3NpemUgd2Via2l0U291cFJlcXVlc3RJbnB1dFN0cmVhbVJlYWRGaW5pc2goR0lucHV0U3Ry ZWFtKiBpbnB1dFN0cmVhbSwgR0FzeW5jUmVzdWx0KiByZXN1bHQsIEdFcnJvcioqIGVycm9yKQog ewotICAgIEdTaW1wbGVBc3luY1Jlc3VsdCogc2ltcGxlUmVzdWx0ID0gR19TSU1QTEVfQVNZTkNf UkVTVUxUKHJlc3VsdCk7Ci0gICAgZ193YXJuX2lmX2ZhaWwoZ19zaW1wbGVfYXN5bmNfcmVzdWx0 X2dldF9zb3VyY2VfdGFnKHNpbXBsZVJlc3VsdCkgPT0gd2Via2l0U291cFJlcXVlc3RJbnB1dFN0 cmVhbVJlYWRBc3luYyk7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoZ190YXNrX2lzX3ZhbGlk KHJlc3VsdCwgaW5wdXRTdHJlYW0pLCAwKTsKIAotICAgIHJldHVybiBnX3NpbXBsZV9hc3luY19y ZXN1bHRfZ2V0X29wX3Jlc19nc3NpemUoc2ltcGxlUmVzdWx0KTsKKyAgICByZXR1cm4gZ190YXNr X3Byb3BhZ2F0ZV9pbnQoR19UQVNLKHJlc3VsdCksIGVycm9yKTsKIH0KIAogc3RhdGljIHZvaWQg d2Via2l0U291cFJlcXVlc3RJbnB1dFN0cmVhbUZpbmFsaXplKEdPYmplY3QqIG9iamVjdCkK