52434 2011-01-14 01:19:54 -0800 [GTK] Convert use of raw pointers to GOwnPtr in FileSystemGtk.cpp 2011-01-14 12:41:54 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 joone webkit-unassigned commit-queue dpranke eric gustavo levin mrobinson oldest_to_newest 334170 0 joone 2011-01-14 01:19:54 -0800 Some functions use GOwnPtr, but others still use gchar & char pointers. 334176 1 78907 joone 2011-01-14 01:34:33 -0800 Created attachment 78907 Proposed Patch 334202 2 78915 joone 2011-01-14 02:19:16 -0800 Created attachment 78915 Proposed Patch2 Sorry, I have submitted the patch again.. 334216 3 78915 levin 2011-01-14 02:40:58 -0800 Comment on attachment 78915 Proposed Patch2 View in context: https://bugs.webkit.org/attachment.cgi?id=78915&action=review Now that I had a second chance to look at it. I think it could be slightly better since you are making this change. Sorry for not noticing last time. > Source/WebCore/platform/gtk/FileSystemGtk.cpp:51 > return string; I wonder why you don't just do return String(escapedString.get()); And the same for the other three places where you did a change. 334231 4 78923 joone 2011-01-14 03:42:24 -0800 Created attachment 78923 Proposed Patch3 Thanks for the review. 334321 5 mrobinson 2011-01-14 08:41:30 -0800 Thanks for the cleanup, Joone! 334328 6 joone 2011-01-14 08:51:54 -0800 (In reply to comment #5) > Thanks for the cleanup, Joone! You're welcome :-) 334337 7 commit-queue 2011-01-14 09:02:23 -0800 The commit-queue encountered the following flaky tests while processing attachment 78923: The commit-queue is continuing to process your patch. 334338 8 78923 commit-queue 2011-01-14 09:03:58 -0800 Comment on attachment 78923 Proposed Patch3 Clearing flags on attachment: 78923 Committed r75797: <http://trac.webkit.org/changeset/75797> 334339 9 commit-queue 2011-01-14 09:04:06 -0800 All reviewed patches have been landed. Closing bug. 334345 10 levin 2011-01-14 09:15:55 -0800 (In reply to comment #7) > The commit-queue encountered the following flaky tests while processing attachment 78923 [details]: > > The commit-queue is continuing to process your patch. Eric, something went wrong here ^^^. 334482 11 eric 2011-01-14 11:58:38 -0800 I think the python tests flaked and it got confused by that: https://webkit-commit-queue.appspot.com/results/7492048 We need to disable that python test. We've known it's been flaky for some time. 334525 12 dpranke 2011-01-14 12:41:54 -0800 (In reply to comment #11) > I think the python tests flaked and it got confused by that: > https://webkit-commit-queue.appspot.com/results/7492048 > > We need to disable that python test. We've known it's been flaky for some time. Perhaps a better solution would be to fix that test? :) 78907 2011-01-14 01:34:33 -0800 2011-01-14 02:19:16 -0800 Proposed Patch GOwnPtr.diff text/plain 2904 joone ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyZWYwNmM4Li41YjVhODQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDEtMTQgIEpvb25lIEh1ciAgPGpvb25lLmh1ckBjb2xsYWJvcmEuY28udWs+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gQ29u dmVydCB1c2Ugb2YgcmF3IHBvaW50ZXJzIHRvIEdPd25QdHIgaW4gRmlsZVN5c3RlbUd0ay5jcHAK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyNDM0CisK KyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIGNvZGUgd2lsbCBiZSB0ZXN0ZWQgd2hlbiBhbiBp bXBsZW1lbnRhdGlvbiAKKyAgICAgICAgb2YgYmVnaW5EcmFnV2l0aEZpbGVzIGlzIGNvbXBsZXRl LiAKKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9GaWxlU3lzdGVtR3RrLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcpOiBVc2UgR093blB0ciBpbnN0ZWFkIG9mIGdjaGFy IHBvaW50ZXIuCisgICAgICAgIChXZWJDb3JlOjpmaWxlU3lzdGVtUmVwcmVzZW50YXRpb24pOiBE aXR0by4KKyAgICAgICAgKFdlYkNvcmU6OmZpbGVuYW1lRm9yRGlzcGxheSk6IERpdHRvLgorICAg ICAgICAoV2ViQ29yZTo6cGF0aEdldEZpbGVOYW1lKTogRGl0dG8uCisKIDIwMTEtMDEtMTMgIE1p a2UgVGhvbGUgIDxtdGhvbGVAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmlu IEFkbGVyIGFuZCBCcmFkeSBFaWRzb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvRmlsZVN5c3RlbUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv RmlsZVN5c3RlbUd0ay5jcHAKaW5kZXggNTExNjMxOC4uNDk1MjQ4NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0ZpbGVTeXN0ZW1HdGsuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9GaWxlU3lzdGVtR3RrLmNwcApAQCAtNDYsOSArNDYsOCBAQCBT dHJpbmcgZmlsZW5hbWVUb1N0cmluZyhjb25zdCBjaGFyKiBmaWxlbmFtZSkKICNpZiBPUyhXSU5E T1dTKQogICAgIHJldHVybiBTdHJpbmc6OmZyb21VVEY4KGZpbGVuYW1lKTsKICNlbHNlCi0gICAg Z2NoYXIqIGVzY2FwZWRTdHJpbmcgPSBnX3VyaV9lc2NhcGVfc3RyaW5nKGZpbGVuYW1lLCAiLzoi LCBmYWxzZSk7Ci0gICAgU3RyaW5nIHN0cmluZyhlc2NhcGVkU3RyaW5nKTsKLSAgICBnX2ZyZWUo ZXNjYXBlZFN0cmluZyk7CisgICAgR093blB0cjxnY2hhcj4gZXNjYXBlZFN0cmluZyhnX3VyaV9l c2NhcGVfc3RyaW5nKGZpbGVuYW1lLCAiLzoiLCBmYWxzZSkpOworICAgIFN0cmluZyBzdHJpbmco ZXNjYXBlZFN0cmluZy5nZXQoKSk7CiAgICAgcmV0dXJuIHN0cmluZzsKICNlbmRpZgogfQpAQCAt NTgsOSArNTcsOCBAQCBDU3RyaW5nIGZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihjb25zdCBTdHJp bmcmIHBhdGgpCiAjaWYgT1MoV0lORE9XUykKICAgICByZXR1cm4gcGF0aC51dGY4KCk7CiAjZWxz ZQotICAgIGNoYXIqIGZpbGVuYW1lID0gZ191cmlfdW5lc2NhcGVfc3RyaW5nKHBhdGgudXRmOCgp LmRhdGEoKSwgMCk7Ci0gICAgQ1N0cmluZyBjZmlsZW5hbWUoZmlsZW5hbWUpOwotICAgIGdfZnJl ZShmaWxlbmFtZSk7CisgICAgR093blB0cjxnY2hhcj4gZmlsZW5hbWUoZ191cmlfdW5lc2NhcGVf c3RyaW5nKHBhdGgudXRmOCgpLmRhdGEoKSwgMCkpOworICAgIENTdHJpbmcgY2ZpbGVuYW1lKGZp bGVuYW1lLmdldCgpKTsKICAgICByZXR1cm4gY2ZpbGVuYW1lOwogI2VuZGlmCiB9CkBAIC03Miwx MyArNzAsMTEgQEAgU3RyaW5nIGZpbGVuYW1lRm9yRGlzcGxheShjb25zdCBTdHJpbmcmIHN0cmlu ZykKICAgICByZXR1cm4gc3RyaW5nOwogI2Vsc2UKICAgICBDU3RyaW5nIGZpbGVuYW1lID0gZmls ZVN5c3RlbVJlcHJlc2VudGF0aW9uKHN0cmluZyk7Ci0gICAgZ2NoYXIqIGRpc3BsYXkgPSBnX2Zp bGVuYW1lX3RvX3V0ZjgoZmlsZW5hbWUuZGF0YSgpLCAwLCAwLCAwLCAwKTsKKyAgICBHT3duUHRy PGdjaGFyPiBkaXNwbGF5KGdfZmlsZW5hbWVfdG9fdXRmOChmaWxlbmFtZS5kYXRhKCksIDAsIDAs IDAsIDApKTsKICAgICBpZiAoIWRpc3BsYXkpCiAgICAgICAgIHJldHVybiBzdHJpbmc7CiAKLSAg ICBTdHJpbmcgZGlzcGxheVN0cmluZyA9IFN0cmluZzo6ZnJvbVVURjgoZGlzcGxheSk7Ci0gICAg Z19mcmVlKGRpc3BsYXkpOwotCisgICAgU3RyaW5nIGRpc3BsYXlTdHJpbmcgPSBTdHJpbmc6OmZy b21VVEY4KGRpc3BsYXkuZ2V0KCkpOwogICAgIHJldHVybiBkaXNwbGF5U3RyaW5nOwogI2VuZGlm CiB9CkBAIC0xNzcsOSArMTczLDggQEAgU3RyaW5nIHBhdGhHZXRGaWxlTmFtZShjb25zdCBTdHJp bmcmIHBhdGhOYW1lKQogICAgICAgICByZXR1cm4gcGF0aE5hbWU7CiAKICAgICBDU3RyaW5nIHRt cEZpbGVuYW1lID0gZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKHBhdGhOYW1lKTsKLSAgICBjaGFy KiBiYXNlTmFtZSA9IGdfcGF0aF9nZXRfYmFzZW5hbWUodG1wRmlsZW5hbWUuZGF0YSgpKTsKLSAg ICBTdHJpbmcgZmlsZU5hbWUgPSBTdHJpbmc6OmZyb21VVEY4KGJhc2VOYW1lKTsKLSAgICBnX2Zy ZWUoYmFzZU5hbWUpOworICAgIEdPd25QdHI8Y2hhcj4gYmFzZU5hbWUoZ19wYXRoX2dldF9iYXNl bmFtZSh0bXBGaWxlbmFtZS5kYXRhKCkpKTsKKyAgICBTdHJpbmcgZmlsZU5hbWUgPSBTdHJpbmc6 OmZyb21VVEY4KGJhc2VOYW1lLmdldCgpKTsKIAogICAgIHJldHVybiBmaWxlTmFtZTsKIH0K 78915 2011-01-14 02:19:16 -0800 2011-01-14 03:42:24 -0800 Proposed Patch2 GOwnPtr2.diff text/plain 2905 joone ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyZWYwNmM4Li41YjVhODQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDEtMTQgIEpvb25lIEh1ciAgPGpvb25lLmh1ckBjb2xsYWJvcmEuY28udWs+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gQ29u dmVydCB1c2Ugb2YgcmF3IHBvaW50ZXJzIHRvIEdPd25QdHIgaW4gRmlsZVN5c3RlbUd0ay5jcHAK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyNDM0CisK KyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIGNvZGUgd2lsbCBiZSB0ZXN0ZWQgd2hlbiBhbiBp bXBsZW1lbnRhdGlvbiAKKyAgICAgICAgb2YgYmVnaW5EcmFnV2l0aEZpbGVzIGlzIGNvbXBsZXRl LiAKKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9GaWxlU3lzdGVtR3RrLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcpOiBVc2UgR093blB0ciBpbnN0ZWFkIG9mIGdjaGFy IHBvaW50ZXIuCisgICAgICAgIChXZWJDb3JlOjpmaWxlU3lzdGVtUmVwcmVzZW50YXRpb24pOiBE aXR0by4KKyAgICAgICAgKFdlYkNvcmU6OmZpbGVuYW1lRm9yRGlzcGxheSk6IERpdHRvLgorICAg ICAgICAoV2ViQ29yZTo6cGF0aEdldEZpbGVOYW1lKTogRGl0dG8uCisKIDIwMTEtMDEtMTMgIE1p a2UgVGhvbGUgIDxtdGhvbGVAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmlu IEFkbGVyIGFuZCBCcmFkeSBFaWRzb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvRmlsZVN5c3RlbUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv RmlsZVN5c3RlbUd0ay5jcHAKaW5kZXggNTExNjMxOC4uM2YxZThjOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0ZpbGVTeXN0ZW1HdGsuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9GaWxlU3lzdGVtR3RrLmNwcApAQCAtNDYsOSArNDYsOCBAQCBT dHJpbmcgZmlsZW5hbWVUb1N0cmluZyhjb25zdCBjaGFyKiBmaWxlbmFtZSkKICNpZiBPUyhXSU5E T1dTKQogICAgIHJldHVybiBTdHJpbmc6OmZyb21VVEY4KGZpbGVuYW1lKTsKICNlbHNlCi0gICAg Z2NoYXIqIGVzY2FwZWRTdHJpbmcgPSBnX3VyaV9lc2NhcGVfc3RyaW5nKGZpbGVuYW1lLCAiLzoi LCBmYWxzZSk7Ci0gICAgU3RyaW5nIHN0cmluZyhlc2NhcGVkU3RyaW5nKTsKLSAgICBnX2ZyZWUo ZXNjYXBlZFN0cmluZyk7CisgICAgR093blB0cjxnY2hhcj4gZXNjYXBlZFN0cmluZyhnX3VyaV9l c2NhcGVfc3RyaW5nKGZpbGVuYW1lLCAiLzoiLCBmYWxzZSkpOworICAgIFN0cmluZyBzdHJpbmco ZXNjYXBlZFN0cmluZy5nZXQoKSk7CiAgICAgcmV0dXJuIHN0cmluZzsKICNlbmRpZgogfQpAQCAt NTgsOSArNTcsOCBAQCBDU3RyaW5nIGZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihjb25zdCBTdHJp bmcmIHBhdGgpCiAjaWYgT1MoV0lORE9XUykKICAgICByZXR1cm4gcGF0aC51dGY4KCk7CiAjZWxz ZQotICAgIGNoYXIqIGZpbGVuYW1lID0gZ191cmlfdW5lc2NhcGVfc3RyaW5nKHBhdGgudXRmOCgp LmRhdGEoKSwgMCk7Ci0gICAgQ1N0cmluZyBjZmlsZW5hbWUoZmlsZW5hbWUpOwotICAgIGdfZnJl ZShmaWxlbmFtZSk7CisgICAgR093blB0cjxnY2hhcj4gZmlsZW5hbWUoZ191cmlfdW5lc2NhcGVf c3RyaW5nKHBhdGgudXRmOCgpLmRhdGEoKSwgMCkpOworICAgIENTdHJpbmcgY2ZpbGVuYW1lKGZp bGVuYW1lLmdldCgpKTsKICAgICByZXR1cm4gY2ZpbGVuYW1lOwogI2VuZGlmCiB9CkBAIC03Miwx MyArNzAsMTEgQEAgU3RyaW5nIGZpbGVuYW1lRm9yRGlzcGxheShjb25zdCBTdHJpbmcmIHN0cmlu ZykKICAgICByZXR1cm4gc3RyaW5nOwogI2Vsc2UKICAgICBDU3RyaW5nIGZpbGVuYW1lID0gZmls ZVN5c3RlbVJlcHJlc2VudGF0aW9uKHN0cmluZyk7Ci0gICAgZ2NoYXIqIGRpc3BsYXkgPSBnX2Zp bGVuYW1lX3RvX3V0ZjgoZmlsZW5hbWUuZGF0YSgpLCAwLCAwLCAwLCAwKTsKKyAgICBHT3duUHRy PGdjaGFyPiBkaXNwbGF5KGdfZmlsZW5hbWVfdG9fdXRmOChmaWxlbmFtZS5kYXRhKCksIDAsIDAs IDAsIDApKTsKICAgICBpZiAoIWRpc3BsYXkpCiAgICAgICAgIHJldHVybiBzdHJpbmc7CiAKLSAg ICBTdHJpbmcgZGlzcGxheVN0cmluZyA9IFN0cmluZzo6ZnJvbVVURjgoZGlzcGxheSk7Ci0gICAg Z19mcmVlKGRpc3BsYXkpOwotCisgICAgU3RyaW5nIGRpc3BsYXlTdHJpbmcgPSBTdHJpbmc6OmZy b21VVEY4KGRpc3BsYXkuZ2V0KCkpOwogICAgIHJldHVybiBkaXNwbGF5U3RyaW5nOwogI2VuZGlm CiB9CkBAIC0xNzcsOSArMTczLDggQEAgU3RyaW5nIHBhdGhHZXRGaWxlTmFtZShjb25zdCBTdHJp bmcmIHBhdGhOYW1lKQogICAgICAgICByZXR1cm4gcGF0aE5hbWU7CiAKICAgICBDU3RyaW5nIHRt cEZpbGVuYW1lID0gZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKHBhdGhOYW1lKTsKLSAgICBjaGFy KiBiYXNlTmFtZSA9IGdfcGF0aF9nZXRfYmFzZW5hbWUodG1wRmlsZW5hbWUuZGF0YSgpKTsKLSAg ICBTdHJpbmcgZmlsZU5hbWUgPSBTdHJpbmc6OmZyb21VVEY4KGJhc2VOYW1lKTsKLSAgICBnX2Zy ZWUoYmFzZU5hbWUpOworICAgIEdPd25QdHI8Z2NoYXI+IGJhc2VOYW1lKGdfcGF0aF9nZXRfYmFz ZW5hbWUodG1wRmlsZW5hbWUuZGF0YSgpKSk7CisgICAgU3RyaW5nIGZpbGVOYW1lID0gU3RyaW5n Ojpmcm9tVVRGOChiYXNlTmFtZS5nZXQoKSk7CiAKICAgICByZXR1cm4gZmlsZU5hbWU7CiB9Cg== 78923 2011-01-14 03:42:24 -0800 2011-01-14 09:03:58 -0800 Proposed Patch3 GOwnPtr3.diff text/plain 2902 joone ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxYmE1NzYxLi5jNjk0ZjA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDEtMTQgIEpvb25lIEh1ciAgPGpvb25lLmh1ckBjb2xsYWJvcmEuY28udWs+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gQ29u dmVydCB1c2Ugb2YgcmF3IHBvaW50ZXJzIHRvIEdPd25QdHIgaW4gRmlsZVN5c3RlbUd0ay5jcHAK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyNDM0CisK KyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIGNvZGUgd2lsbCBiZSB0ZXN0ZWQgd2hlbiBhbiBp bXBsZW1lbnRhdGlvbiAKKyAgICAgICAgb2YgYmVnaW5EcmFnV2l0aEZpbGVzIGlzIGNvbXBsZXRl LiAKKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9GaWxlU3lzdGVtR3RrLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcpOiBVc2UgR093blB0ciBpbnN0ZWFkIG9mIGdjaGFy IHBvaW50ZXIuCisgICAgICAgIChXZWJDb3JlOjpmaWxlU3lzdGVtUmVwcmVzZW50YXRpb24pOiBE aXR0by4KKyAgICAgICAgKFdlYkNvcmU6OmZpbGVuYW1lRm9yRGlzcGxheSk6IERpdHRvLgorICAg ICAgICAoV2ViQ29yZTo6cGF0aEdldEZpbGVOYW1lKTogRGl0dG8uCisKIDIwMTEtMDEtMTIgIEls eWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IFl1cnkgU2VtaWtoYXRza3kuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvRmlsZVN5c3RlbUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvRmls ZVN5c3RlbUd0ay5jcHAKaW5kZXggNTExNjMxOC4uYjNjNGM5ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0ZpbGVTeXN0ZW1HdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2d0ay9GaWxlU3lzdGVtR3RrLmNwcApAQCAtNDYsMTAgKzQ2LDggQEAgU3Ry aW5nIGZpbGVuYW1lVG9TdHJpbmcoY29uc3QgY2hhciogZmlsZW5hbWUpCiAjaWYgT1MoV0lORE9X UykKICAgICByZXR1cm4gU3RyaW5nOjpmcm9tVVRGOChmaWxlbmFtZSk7CiAjZWxzZQotICAgIGdj aGFyKiBlc2NhcGVkU3RyaW5nID0gZ191cmlfZXNjYXBlX3N0cmluZyhmaWxlbmFtZSwgIi86Iiwg ZmFsc2UpOwotICAgIFN0cmluZyBzdHJpbmcoZXNjYXBlZFN0cmluZyk7Ci0gICAgZ19mcmVlKGVz Y2FwZWRTdHJpbmcpOwotICAgIHJldHVybiBzdHJpbmc7CisgICAgR093blB0cjxnY2hhcj4gZXNj YXBlZFN0cmluZyhnX3VyaV9lc2NhcGVfc3RyaW5nKGZpbGVuYW1lLCAiLzoiLCBmYWxzZSkpOwor ICAgIHJldHVybiBlc2NhcGVkU3RyaW5nLmdldCgpOwogI2VuZGlmCiB9CiAKQEAgLTU4LDEwICs1 Niw4IEBAIENTdHJpbmcgZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGNvbnN0IFN0cmluZyYgcGF0 aCkKICNpZiBPUyhXSU5ET1dTKQogICAgIHJldHVybiBwYXRoLnV0ZjgoKTsKICNlbHNlCi0gICAg Y2hhciogZmlsZW5hbWUgPSBnX3VyaV91bmVzY2FwZV9zdHJpbmcocGF0aC51dGY4KCkuZGF0YSgp LCAwKTsKLSAgICBDU3RyaW5nIGNmaWxlbmFtZShmaWxlbmFtZSk7Ci0gICAgZ19mcmVlKGZpbGVu YW1lKTsKLSAgICByZXR1cm4gY2ZpbGVuYW1lOworICAgIEdPd25QdHI8Z2NoYXI+IGZpbGVuYW1l KGdfdXJpX3VuZXNjYXBlX3N0cmluZyhwYXRoLnV0ZjgoKS5kYXRhKCksIDApKTsKKyAgICByZXR1 cm4gZmlsZW5hbWUuZ2V0KCk7CiAjZW5kaWYKIH0KIApAQCAtNzIsMTQgKzY4LDExIEBAIFN0cmlu ZyBmaWxlbmFtZUZvckRpc3BsYXkoY29uc3QgU3RyaW5nJiBzdHJpbmcpCiAgICAgcmV0dXJuIHN0 cmluZzsKICNlbHNlCiAgICAgQ1N0cmluZyBmaWxlbmFtZSA9IGZpbGVTeXN0ZW1SZXByZXNlbnRh dGlvbihzdHJpbmcpOwotICAgIGdjaGFyKiBkaXNwbGF5ID0gZ19maWxlbmFtZV90b191dGY4KGZp bGVuYW1lLmRhdGEoKSwgMCwgMCwgMCwgMCk7CisgICAgR093blB0cjxnY2hhcj4gZGlzcGxheShn X2ZpbGVuYW1lX3RvX3V0ZjgoZmlsZW5hbWUuZGF0YSgpLCAwLCAwLCAwLCAwKSk7CiAgICAgaWYg KCFkaXNwbGF5KQogICAgICAgICByZXR1cm4gc3RyaW5nOwogCi0gICAgU3RyaW5nIGRpc3BsYXlT dHJpbmcgPSBTdHJpbmc6OmZyb21VVEY4KGRpc3BsYXkpOwotICAgIGdfZnJlZShkaXNwbGF5KTsK LQotICAgIHJldHVybiBkaXNwbGF5U3RyaW5nOworICAgIHJldHVybiBTdHJpbmc6OmZyb21VVEY4 KGRpc3BsYXkuZ2V0KCkpOwogI2VuZGlmCiB9CiAKQEAgLTE3NywxMSArMTcwLDggQEAgU3RyaW5n IHBhdGhHZXRGaWxlTmFtZShjb25zdCBTdHJpbmcmIHBhdGhOYW1lKQogICAgICAgICByZXR1cm4g cGF0aE5hbWU7CiAKICAgICBDU3RyaW5nIHRtcEZpbGVuYW1lID0gZmlsZVN5c3RlbVJlcHJlc2Vu dGF0aW9uKHBhdGhOYW1lKTsKLSAgICBjaGFyKiBiYXNlTmFtZSA9IGdfcGF0aF9nZXRfYmFzZW5h bWUodG1wRmlsZW5hbWUuZGF0YSgpKTsKLSAgICBTdHJpbmcgZmlsZU5hbWUgPSBTdHJpbmc6OmZy b21VVEY4KGJhc2VOYW1lKTsKLSAgICBnX2ZyZWUoYmFzZU5hbWUpOwotCi0gICAgcmV0dXJuIGZp bGVOYW1lOworICAgIEdPd25QdHI8Z2NoYXI+IGJhc2VOYW1lKGdfcGF0aF9nZXRfYmFzZW5hbWUo dG1wRmlsZW5hbWUuZGF0YSgpKSk7CisgICAgcmV0dXJuIFN0cmluZzo6ZnJvbVVURjgoYmFzZU5h bWUuZ2V0KCkpOwogfQogCiBDU3RyaW5nIGFwcGxpY2F0aW9uRGlyZWN0b3J5UGF0aCgpCg==