98009 2012-10-01 03:41:42 -0700 [GTK] WebKitDownload: use more of GOwnPtr/GRefPtr 2012-10-01 04:30:29 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 csaavedra webkit-unassigned webkit.review.bot oldest_to_newest 731539 0 csaavedra 2012-10-01 03:41:42 -0700 There are plenty of uses of raw pointers here, so let's fix a few. 731540 1 166441 csaavedra 2012-10-01 03:44:58 -0700 Created attachment 166441 [GTK] WebKitDownload: use more of GOwnPtr/GRefPtr https://bugs.webkit.org/show_bug.cgi?id=98009 Reviewed by NOBODY (OOPS!). Use more GOwnPtr/GRefPtr in WebKitDownload * webkit/webkitdownload.cpp: (webkit_download_open_stream_for_uri): Use GRefPtr for a GFile and GOwnPtr for GError. (webkit_download_set_destination_uri): Ditto. (webkit_download_received_data): Use GOwnPtr for GError. 731542 2 webkit.review.bot 2012-10-01 03:48:15 -0700 Attachment 166441 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/gtk/ChangeLog', u'Source/Web..." exit_code: 1 Source/WebKit/gtk/webkit/webkitdownload.cpp:862: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 731545 3 166441 cgarcia 2012-10-01 03:49:49 -0700 Comment on attachment 166441 [GTK] WebKitDownload: use more of GOwnPtr/GRefPtr https://bugs.webkit.org/show_bug.cgi?id=98009 View in context: https://bugs.webkit.org/attachment.cgi?id=166441&action=review Thanks, GRefPtr increases the ref counter in the assign operator, so you need to adopt the ref to avoid it. > Source/WebKit/gtk/webkit/webkitdownload.cpp:463 > + GRefPtr<GFile> file = g_file_new_for_uri(uri); You need to adopt the ref, use GRefPtr<GFile> file = adoptGRef(g_file_new_for_uri(uri)); > Source/WebKit/gtk/webkit/webkitdownload.cpp:698 > + GRefPtr<GFile> src = g_file_new_for_uri(priv->destinationURI); > + GRefPtr<GFile> dest = g_file_new_for_uri(destination_uri); These should be adopted too. > Source/WebKit/gtk/webkit/webkitdownload.cpp:701 > + g_file_move(src.get(), dest.get(), G_FILE_COPY_BACKUP, NULL, NULL, NULL, &error.outPtr()); Use 0 instead of NULL now that you are changing this line. 731549 4 166443 csaavedra 2012-10-01 03:59:46 -0700 Created attachment 166443 [GTK] WebKitDownload: use more of GOwnPtr/GRefPtr https://bugs.webkit.org/show_bug.cgi?id=98009 Reviewed by NOBODY (OOPS!). Use more GOwnPtr/GRefPtr in WebKitDownload * webkit/webkitdownload.cpp: (webkit_download_open_stream_for_uri): Use GRefPtr for a GFile and GOwnPtr for GError. (webkit_download_set_destination_uri): Ditto. (webkit_download_received_data): Use GOwnPtr for GError. 731554 5 webkit.review.bot 2012-10-01 04:03:46 -0700 Attachment 166443 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/gtk/ChangeLog', u'Source/Web..." exit_code: 1 Source/WebKit/gtk/webkit/webkitdownload.cpp:862: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 731556 6 166443 cgarcia 2012-10-01 04:06:03 -0700 Comment on attachment 166443 [GTK] WebKitDownload: use more of GOwnPtr/GRefPtr https://bugs.webkit.org/show_bug.cgi?id=98009 Perfect! 731574 7 166443 webkit.review.bot 2012-10-01 04:30:26 -0700 Comment on attachment 166443 [GTK] WebKitDownload: use more of GOwnPtr/GRefPtr https://bugs.webkit.org/show_bug.cgi?id=98009 Clearing flags on attachment: 166443 Committed r130036: <http://trac.webkit.org/changeset/130036> 731575 8 webkit.review.bot 2012-10-01 04:30:29 -0700 All reviewed patches have been landed. Closing bug. 166441 2012-10-01 03:44:58 -0700 2012-10-01 04:00:14 -0700 [GTK] WebKitDownload: use more of GOwnPtr/GRefPtr https://bugs.webkit.org/show_bug.cgi?id=98009 GTK-WebKitDownload-use-more-of-GOwnPtrGRefPtr-http.patch text/plain 4874 csaavedra RnJvbSA2MzI1MzFhZmRhMTJkMDczNGUyMTFiMjk1OGQzOGRlNzI3MmIzZmQxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDbGF1ZGlvIFNhYXZlZHJhIDxjc2FhdmVkcmFAaWdhbGlhLmNv bT4KRGF0ZTogTW9uLCAxIE9jdCAyMDEyIDEzOjQzOjIyICswMzAwClN1YmplY3Q6IFtQQVRDSF0g W0dUS10gV2ViS2l0RG93bmxvYWQ6IHVzZSBtb3JlIG9mIEdPd25QdHIvR1JlZlB0cgogaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk4MDA5CgogICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBVc2UgbW9yZSBHT3duUHRyL0dSZWZQdHIgaW4g V2ViS2l0RG93bmxvYWQKCiAgICAgICAgKiB3ZWJraXQvd2Via2l0ZG93bmxvYWQuY3BwOgogICAg ICAgICh3ZWJraXRfZG93bmxvYWRfb3Blbl9zdHJlYW1fZm9yX3VyaSk6IFVzZSBHUmVmUHRyCiAg ICAgICAgZm9yIGEgR0ZpbGUgYW5kIEdPd25QdHIgZm9yIEdFcnJvci4KICAgICAgICAod2Via2l0 X2Rvd25sb2FkX3NldF9kZXN0aW5hdGlvbl91cmkpOiBEaXR0by4KICAgICAgICAod2Via2l0X2Rv d25sb2FkX3JlY2VpdmVkX2RhdGEpOiBVc2UgR093blB0ciBmb3IgR0Vycm9yLgotLS0KIFNvdXJj ZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgfCAxNSArKysrKysrKysrKysr KysKIFNvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRkb3dubG9hZC5jcHAgfCAyOSArKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25z KCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggYTQxN2JhNy4uMTg4MDQw YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTEwLTAxICBDbGF1ZGlv IFNhYXZlZHJhICA8Y3NhYXZlZHJhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gV2ViS2l0 RG93bmxvYWQ6IHVzZSBtb3JlIG9mIEdPd25QdHIvR1JlZlB0cgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTgwMDkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgbW9yZSBHT3duUHRyL0dSZWZQdHIgaW4g V2ViS2l0RG93bmxvYWQKKworICAgICAgICAqIHdlYmtpdC93ZWJraXRkb3dubG9hZC5jcHA6Cisg ICAgICAgICh3ZWJraXRfZG93bmxvYWRfb3Blbl9zdHJlYW1fZm9yX3VyaSk6IFVzZSBHUmVmUHRy CisgICAgICAgIGZvciBhIEdGaWxlIGFuZCBHT3duUHRyIGZvciBHRXJyb3IuCisgICAgICAgICh3 ZWJraXRfZG93bmxvYWRfc2V0X2Rlc3RpbmF0aW9uX3VyaSk6IERpdHRvLgorICAgICAgICAod2Vi a2l0X2Rvd25sb2FkX3JlY2VpdmVkX2RhdGEpOiBVc2UgR093blB0ciBmb3IgR0Vycm9yLgorCiAy MDEyLTA5LTI4ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwu Y29tPgogCiAgICAgICAgIENvZGUgaW5zaWRlIEZyYW1lTG9hZGVyQ2xpZW50OjpjYW5TaG93TUlN RVR5cGUoKSBpbXBsZW1lbnRhdGlvbnMgY2FuIGJlIHNoYXJlZCBhbW9uZyBkaWZmZXJlbnQgV0sg cG9ydHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRkb3dubG9h ZC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0ZG93bmxvYWQuY3BwCmluZGV4 IGU2OThlZDUuLmM3M2NmOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93 ZWJraXRkb3dubG9hZC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdGRv d25sb2FkLmNwcApAQCAtMzgsNiArMzgsNyBAQAogI2luY2x1ZGUgPGdsaWIvZ2kxOG4tbGliLmg+ CiAjaW5jbHVkZSA8Z2xpYi9nc3RkaW8uaD4KICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4K KyNpbmNsdWRlIDx3dGYvZ29iamVjdC9HT3duUHRyLmg+CiAjaW5jbHVkZSA8d3RmL2dvYmplY3Qv R1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIApAQCAtNDU5LDE5ICs0 NjAsMTYgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdF9kb3dubG9hZF9vcGVuX3N0cmVhbV9mb3Jf dXJpKFdlYktpdERvd25sb2FkKiBkb3dubG9hZCwgY28KICAgICBnX3JldHVybl92YWxfaWZfZmFp bCh1cmksIEZBTFNFKTsKIAogICAgIFdlYktpdERvd25sb2FkUHJpdmF0ZSogcHJpdiA9IGRvd25s b2FkLT5wcml2OwotICAgIEdGaWxlKiBmaWxlID0gZ19maWxlX25ld19mb3JfdXJpKHVyaSk7Ci0g ICAgR0Vycm9yKiBlcnJvciA9IE5VTEw7CisgICAgR1JlZlB0cjxHRmlsZT4gZmlsZSA9IGdfZmls ZV9uZXdfZm9yX3VyaSh1cmkpOworICAgIEdPd25QdHI8R0Vycm9yPiBlcnJvcjsKIAogICAgIGlm IChhcHBlbmQpCi0gICAgICAgIHByaXYtPm91dHB1dFN0cmVhbSA9IGdfZmlsZV9hcHBlbmRfdG8o ZmlsZSwgR19GSUxFX0NSRUFURV9OT05FLCBOVUxMLCAmZXJyb3IpOworICAgICAgICBwcml2LT5v dXRwdXRTdHJlYW0gPSBnX2ZpbGVfYXBwZW5kX3RvKGZpbGUuZ2V0KCksIEdfRklMRV9DUkVBVEVf Tk9ORSwgTlVMTCwgJmVycm9yLm91dFB0cigpKTsKICAgICBlbHNlCi0gICAgICAgIHByaXYtPm91 dHB1dFN0cmVhbSA9IGdfZmlsZV9yZXBsYWNlKGZpbGUsIE5VTEwsIFRSVUUsIEdfRklMRV9DUkVB VEVfTk9ORSwgTlVMTCwgJmVycm9yKTsKLQotICAgIGdfb2JqZWN0X3VucmVmKGZpbGUpOworICAg ICAgICBwcml2LT5vdXRwdXRTdHJlYW0gPSBnX2ZpbGVfcmVwbGFjZShmaWxlLmdldCgpLCBOVUxM LCBUUlVFLCBHX0ZJTEVfQ1JFQVRFX05PTkUsIE5VTEwsICZlcnJvci5vdXRQdHIoKSk7CiAKICAg ICBpZiAoZXJyb3IpIHsKICAgICAgICAgd2Via2l0RG93bmxvYWRFbWl0RXJyb3IoZG93bmxvYWQs IGRvd25sb2FkRGVzdGluYXRpb25FcnJvcihjb3JlKHByaXYtPm5ldHdvcmtSZXNwb25zZSksIGVy cm9yLT5tZXNzYWdlKSk7Ci0gICAgICAgIGdfZXJyb3JfZnJlZShlcnJvcik7CiAgICAgICAgIHJl dHVybiBGQUxTRTsKICAgICB9CiAKQEAgLTY5NiwyMSArNjk0LDE3IEBAIHZvaWQgd2Via2l0X2Rv d25sb2FkX3NldF9kZXN0aW5hdGlvbl91cmkoV2ViS2l0RG93bmxvYWQqIGRvd25sb2FkLCBjb25z dCBnY2hhcioKICAgICAgICAgaWYgKGRvd25sb2FkaW5nKQogICAgICAgICAgICAgd2Via2l0X2Rv d25sb2FkX2Nsb3NlX3N0cmVhbShkb3dubG9hZCk7CiAKLSAgICAgICAgR0ZpbGUqIHNyYyA9IGdf ZmlsZV9uZXdfZm9yX3VyaShwcml2LT5kZXN0aW5hdGlvblVSSSk7Ci0gICAgICAgIEdGaWxlKiBk ZXN0ID0gZ19maWxlX25ld19mb3JfdXJpKGRlc3RpbmF0aW9uX3VyaSk7Ci0gICAgICAgIEdFcnJv ciogZXJyb3IgPSBOVUxMOwotCi0gICAgICAgIGdfZmlsZV9tb3ZlKHNyYywgZGVzdCwgR19GSUxF X0NPUFlfQkFDS1VQLCBOVUxMLCBOVUxMLCBOVUxMLCAmZXJyb3IpOworICAgICAgICBHUmVmUHRy PEdGaWxlPiBzcmMgPSBnX2ZpbGVfbmV3X2Zvcl91cmkocHJpdi0+ZGVzdGluYXRpb25VUkkpOwor ICAgICAgICBHUmVmUHRyPEdGaWxlPiBkZXN0ID0gZ19maWxlX25ld19mb3JfdXJpKGRlc3RpbmF0 aW9uX3VyaSk7CisgICAgICAgIEdPd25QdHI8R0Vycm9yPiBlcnJvcjsKIAotICAgICAgICBnX29i amVjdF91bnJlZihzcmMpOwotICAgICAgICBnX29iamVjdF91bnJlZihkZXN0KTsKKyAgICAgICAg Z19maWxlX21vdmUoc3JjLmdldCgpLCBkZXN0LmdldCgpLCBHX0ZJTEVfQ09QWV9CQUNLVVAsIE5V TEwsIE5VTEwsIE5VTEwsICZlcnJvci5vdXRQdHIoKSk7CiAKICAgICAgICAgZ19mcmVlKHByaXYt PmRlc3RpbmF0aW9uVVJJKTsKICAgICAgICAgcHJpdi0+ZGVzdGluYXRpb25VUkkgPSBnX3N0cmR1 cChkZXN0aW5hdGlvbl91cmkpOwogCiAgICAgICAgIGlmIChlcnJvcikgewogICAgICAgICAgICAg d2Via2l0RG93bmxvYWRFbWl0RXJyb3IoZG93bmxvYWQsIGRvd25sb2FkRGVzdGluYXRpb25FcnJv cihjb3JlKHByaXYtPm5ldHdvcmtSZXNwb25zZSksIGVycm9yLT5tZXNzYWdlKSk7Ci0gICAgICAg ICAgICBnX2Vycm9yX2ZyZWUoZXJyb3IpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 CiAKQEAgLTg2MiwxNCArODU2LDEzIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9kb3dubG9hZF9yZWNl aXZlZF9kYXRhKFdlYktpdERvd25sb2FkKiBkb3dubG9hZCwgY29uc3QgZ2NoYXIqCiAgICAgQVNT RVJUKHByaXYtPm91dHB1dFN0cmVhbSk7CiAKICAgICBnc2l6ZSBieXRlc193cml0dGVuOwotICAg IEdFcnJvciogZXJyb3IgPSBOVUxMOworICAgIEdPd25QdHI8R0Vycm9yPiBlcnJvcjsKIAogICAg IGdfb3V0cHV0X3N0cmVhbV93cml0ZV9hbGwoR19PVVRQVVRfU1RSRUFNKHByaXYtPm91dHB1dFN0 cmVhbSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkYXRhLCBsZW5ndGgsICZieXRl c193cml0dGVuLCBOVUxMLCAmZXJyb3IpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZGF0YSwgbGVuZ3RoLCAmYnl0ZXNfd3JpdHRlbiwgTlVMTCwgJmVycm9yLm91dFB0cigpKTsKIAog ICAgIGlmIChlcnJvcikgewogICAgICAgICB3ZWJraXREb3dubG9hZEVtaXRFcnJvcihkb3dubG9h ZCwgZG93bmxvYWREZXN0aW5hdGlvbkVycm9yKGNvcmUocHJpdi0+bmV0d29ya1Jlc3BvbnNlKSwg ZXJyb3ItPm1lc3NhZ2UpKTsKLSAgICAgICAgZ19lcnJvcl9mcmVlKGVycm9yKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KIAotLSAKMS43LjExLjQ= 166443 2012-10-01 03:59:46 -0700 2012-10-01 04:30:26 -0700 [GTK] WebKitDownload: use more of GOwnPtr/GRefPtr https://bugs.webkit.org/show_bug.cgi?id=98009 GTK-WebKitDownload-use-more-of-GOwnPtrGRefPtr-http.patch text/plain 4898 csaavedra RnJvbSA1MzU1MDE5ZjA4ZmNmYWM0OTc5OGI1MGU1Mzk1M2QxYzc2MTdkYjBkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDbGF1ZGlvIFNhYXZlZHJhIDxjc2FhdmVkcmFAaWdhbGlhLmNv bT4KRGF0ZTogTW9uLCAxIE9jdCAyMDEyIDEzOjQzOjIyICswMzAwClN1YmplY3Q6IFtQQVRDSF0g W0dUS10gV2ViS2l0RG93bmxvYWQ6IHVzZSBtb3JlIG9mIEdPd25QdHIvR1JlZlB0cgogaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk4MDA5CgogICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBVc2UgbW9yZSBHT3duUHRyL0dSZWZQdHIgaW4g V2ViS2l0RG93bmxvYWQKCiAgICAgICAgKiB3ZWJraXQvd2Via2l0ZG93bmxvYWQuY3BwOgogICAg ICAgICh3ZWJraXRfZG93bmxvYWRfb3Blbl9zdHJlYW1fZm9yX3VyaSk6IFVzZSBHUmVmUHRyCiAg ICAgICAgZm9yIGEgR0ZpbGUgYW5kIEdPd25QdHIgZm9yIEdFcnJvci4KICAgICAgICAod2Via2l0 X2Rvd25sb2FkX3NldF9kZXN0aW5hdGlvbl91cmkpOiBEaXR0by4KICAgICAgICAod2Via2l0X2Rv d25sb2FkX3JlY2VpdmVkX2RhdGEpOiBVc2UgR093blB0ciBmb3IgR0Vycm9yLgotLS0KIFNvdXJj ZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgfCAxNSArKysrKysrKysrKysr KysKIFNvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRkb3dubG9hZC5jcHAgfCAyOSArKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25z KCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggYTQxN2JhNy4uMTg4MDQw YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTEwLTAxICBDbGF1ZGlv IFNhYXZlZHJhICA8Y3NhYXZlZHJhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gV2ViS2l0 RG93bmxvYWQ6IHVzZSBtb3JlIG9mIEdPd25QdHIvR1JlZlB0cgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTgwMDkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgbW9yZSBHT3duUHRyL0dSZWZQdHIgaW4g V2ViS2l0RG93bmxvYWQKKworICAgICAgICAqIHdlYmtpdC93ZWJraXRkb3dubG9hZC5jcHA6Cisg ICAgICAgICh3ZWJraXRfZG93bmxvYWRfb3Blbl9zdHJlYW1fZm9yX3VyaSk6IFVzZSBHUmVmUHRy CisgICAgICAgIGZvciBhIEdGaWxlIGFuZCBHT3duUHRyIGZvciBHRXJyb3IuCisgICAgICAgICh3 ZWJraXRfZG93bmxvYWRfc2V0X2Rlc3RpbmF0aW9uX3VyaSk6IERpdHRvLgorICAgICAgICAod2Vi a2l0X2Rvd25sb2FkX3JlY2VpdmVkX2RhdGEpOiBVc2UgR093blB0ciBmb3IgR0Vycm9yLgorCiAy MDEyLTA5LTI4ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwu Y29tPgogCiAgICAgICAgIENvZGUgaW5zaWRlIEZyYW1lTG9hZGVyQ2xpZW50OjpjYW5TaG93TUlN RVR5cGUoKSBpbXBsZW1lbnRhdGlvbnMgY2FuIGJlIHNoYXJlZCBhbW9uZyBkaWZmZXJlbnQgV0sg cG9ydHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRkb3dubG9h ZC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0ZG93bmxvYWQuY3BwCmluZGV4 IGU2OThlZDUuLjhjYThmYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93 ZWJraXRkb3dubG9hZC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdGRv d25sb2FkLmNwcApAQCAtMzgsNiArMzgsNyBAQAogI2luY2x1ZGUgPGdsaWIvZ2kxOG4tbGliLmg+ CiAjaW5jbHVkZSA8Z2xpYi9nc3RkaW8uaD4KICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4K KyNpbmNsdWRlIDx3dGYvZ29iamVjdC9HT3duUHRyLmg+CiAjaW5jbHVkZSA8d3RmL2dvYmplY3Qv R1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIApAQCAtNDU5LDE5ICs0 NjAsMTYgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdF9kb3dubG9hZF9vcGVuX3N0cmVhbV9mb3Jf dXJpKFdlYktpdERvd25sb2FkKiBkb3dubG9hZCwgY28KICAgICBnX3JldHVybl92YWxfaWZfZmFp bCh1cmksIEZBTFNFKTsKIAogICAgIFdlYktpdERvd25sb2FkUHJpdmF0ZSogcHJpdiA9IGRvd25s b2FkLT5wcml2OwotICAgIEdGaWxlKiBmaWxlID0gZ19maWxlX25ld19mb3JfdXJpKHVyaSk7Ci0g ICAgR0Vycm9yKiBlcnJvciA9IE5VTEw7CisgICAgR1JlZlB0cjxHRmlsZT4gZmlsZSA9IGFkb3B0 R1JlZihnX2ZpbGVfbmV3X2Zvcl91cmkodXJpKSk7CisgICAgR093blB0cjxHRXJyb3I+IGVycm9y OwogCiAgICAgaWYgKGFwcGVuZCkKLSAgICAgICAgcHJpdi0+b3V0cHV0U3RyZWFtID0gZ19maWxl X2FwcGVuZF90byhmaWxlLCBHX0ZJTEVfQ1JFQVRFX05PTkUsIE5VTEwsICZlcnJvcik7CisgICAg ICAgIHByaXYtPm91dHB1dFN0cmVhbSA9IGdfZmlsZV9hcHBlbmRfdG8oZmlsZS5nZXQoKSwgR19G SUxFX0NSRUFURV9OT05FLCBOVUxMLCAmZXJyb3Iub3V0UHRyKCkpOwogICAgIGVsc2UKLSAgICAg ICAgcHJpdi0+b3V0cHV0U3RyZWFtID0gZ19maWxlX3JlcGxhY2UoZmlsZSwgTlVMTCwgVFJVRSwg R19GSUxFX0NSRUFURV9OT05FLCBOVUxMLCAmZXJyb3IpOwotCi0gICAgZ19vYmplY3RfdW5yZWYo ZmlsZSk7CisgICAgICAgIHByaXYtPm91dHB1dFN0cmVhbSA9IGdfZmlsZV9yZXBsYWNlKGZpbGUu Z2V0KCksIE5VTEwsIFRSVUUsIEdfRklMRV9DUkVBVEVfTk9ORSwgTlVMTCwgJmVycm9yLm91dFB0 cigpKTsKIAogICAgIGlmIChlcnJvcikgewogICAgICAgICB3ZWJraXREb3dubG9hZEVtaXRFcnJv cihkb3dubG9hZCwgZG93bmxvYWREZXN0aW5hdGlvbkVycm9yKGNvcmUocHJpdi0+bmV0d29ya1Jl c3BvbnNlKSwgZXJyb3ItPm1lc3NhZ2UpKTsKLSAgICAgICAgZ19lcnJvcl9mcmVlKGVycm9yKTsK ICAgICAgICAgcmV0dXJuIEZBTFNFOwogICAgIH0KIApAQCAtNjk2LDIxICs2OTQsMTcgQEAgdm9p ZCB3ZWJraXRfZG93bmxvYWRfc2V0X2Rlc3RpbmF0aW9uX3VyaShXZWJLaXREb3dubG9hZCogZG93 bmxvYWQsIGNvbnN0IGdjaGFyKgogICAgICAgICBpZiAoZG93bmxvYWRpbmcpCiAgICAgICAgICAg ICB3ZWJraXRfZG93bmxvYWRfY2xvc2Vfc3RyZWFtKGRvd25sb2FkKTsKIAotICAgICAgICBHRmls ZSogc3JjID0gZ19maWxlX25ld19mb3JfdXJpKHByaXYtPmRlc3RpbmF0aW9uVVJJKTsKLSAgICAg ICAgR0ZpbGUqIGRlc3QgPSBnX2ZpbGVfbmV3X2Zvcl91cmkoZGVzdGluYXRpb25fdXJpKTsKLSAg ICAgICAgR0Vycm9yKiBlcnJvciA9IE5VTEw7Ci0KLSAgICAgICAgZ19maWxlX21vdmUoc3JjLCBk ZXN0LCBHX0ZJTEVfQ09QWV9CQUNLVVAsIE5VTEwsIE5VTEwsIE5VTEwsICZlcnJvcik7CisgICAg ICAgIEdSZWZQdHI8R0ZpbGU+IHNyYyA9IGFkb3B0R1JlZihnX2ZpbGVfbmV3X2Zvcl91cmkocHJp di0+ZGVzdGluYXRpb25VUkkpKTsKKyAgICAgICAgR1JlZlB0cjxHRmlsZT4gZGVzdCA9IGFkb3B0 R1JlZihnX2ZpbGVfbmV3X2Zvcl91cmkoZGVzdGluYXRpb25fdXJpKSk7CisgICAgICAgIEdPd25Q dHI8R0Vycm9yPiBlcnJvcjsKIAotICAgICAgICBnX29iamVjdF91bnJlZihzcmMpOwotICAgICAg ICBnX29iamVjdF91bnJlZihkZXN0KTsKKyAgICAgICAgZ19maWxlX21vdmUoc3JjLmdldCgpLCBk ZXN0LmdldCgpLCBHX0ZJTEVfQ09QWV9CQUNLVVAsIDAsIDAsIDAsICZlcnJvci5vdXRQdHIoKSk7 CiAKICAgICAgICAgZ19mcmVlKHByaXYtPmRlc3RpbmF0aW9uVVJJKTsKICAgICAgICAgcHJpdi0+ ZGVzdGluYXRpb25VUkkgPSBnX3N0cmR1cChkZXN0aW5hdGlvbl91cmkpOwogCiAgICAgICAgIGlm IChlcnJvcikgewogICAgICAgICAgICAgd2Via2l0RG93bmxvYWRFbWl0RXJyb3IoZG93bmxvYWQs IGRvd25sb2FkRGVzdGluYXRpb25FcnJvcihjb3JlKHByaXYtPm5ldHdvcmtSZXNwb25zZSksIGVy cm9yLT5tZXNzYWdlKSk7Ci0gICAgICAgICAgICBnX2Vycm9yX2ZyZWUoZXJyb3IpOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAgLTg2MiwxNCArODU2LDEzIEBAIHN0YXRpYyB2 b2lkIHdlYmtpdF9kb3dubG9hZF9yZWNlaXZlZF9kYXRhKFdlYktpdERvd25sb2FkKiBkb3dubG9h ZCwgY29uc3QgZ2NoYXIqCiAgICAgQVNTRVJUKHByaXYtPm91dHB1dFN0cmVhbSk7CiAKICAgICBn c2l6ZSBieXRlc193cml0dGVuOwotICAgIEdFcnJvciogZXJyb3IgPSBOVUxMOworICAgIEdPd25Q dHI8R0Vycm9yPiBlcnJvcjsKIAogICAgIGdfb3V0cHV0X3N0cmVhbV93cml0ZV9hbGwoR19PVVRQ VVRfU1RSRUFNKHByaXYtPm91dHB1dFN0cmVhbSksCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBkYXRhLCBsZW5ndGgsICZieXRlc193cml0dGVuLCBOVUxMLCAmZXJyb3IpOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZGF0YSwgbGVuZ3RoLCAmYnl0ZXNfd3JpdHRlbiwgTlVM TCwgJmVycm9yLm91dFB0cigpKTsKIAogICAgIGlmIChlcnJvcikgewogICAgICAgICB3ZWJraXRE b3dubG9hZEVtaXRFcnJvcihkb3dubG9hZCwgZG93bmxvYWREZXN0aW5hdGlvbkVycm9yKGNvcmUo cHJpdi0+bmV0d29ya1Jlc3BvbnNlKSwgZXJyb3ItPm1lc3NhZ2UpKTsKLSAgICAgICAgZ19lcnJv cl9mcmVlKGVycm9yKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotLSAKMS43LjExLjQ=