199800 2019-07-15 12:37:01 -0700 [WPE][GTK] Improvements and fixes in FileSystemGlib.cpp 2019-07-16 01:09:59 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro mcatanzaro benjamin bugs-noreply cdumez cgarcia cmarcelo commit-queue dbates ews-watchlist mcatanzaro oldest_to_newest 1552925 0 mcatanzaro 2019-07-15 12:37:01 -0700 * Use nullptr * Fix GFileInfo leak in getFileSize * Use GRefPtr to clarify ownership of the GFileIOStream in openFile 1552926 1 374137 mcatanzaro 2019-07-15 13:00:28 -0700 Created attachment 374137 Patch 1553139 2 374137 cgarcia 2019-07-16 00:40:10 -0700 Comment on attachment 374137 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374137&action=review > Source/WTF/wtf/glib/FileSystemGlib.cpp:358 > - return ioStream; > + return ioStream.leakRef(); I don't see why this clarifies anything, but ok. 1553146 3 374137 commit-queue 2019-07-16 01:09:58 -0700 Comment on attachment 374137 Patch Clearing flags on attachment: 374137 Committed r247477: <https://trac.webkit.org/changeset/247477> 1553147 4 commit-queue 2019-07-16 01:09:59 -0700 All reviewed patches have been landed. Closing bug. 374137 2019-07-15 13:00:28 -0700 2019-07-16 01:09:58 -0700 Patch bug-199800-20190715150027.patch text/plain 5659 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MzkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDAxNTFiYTllODUwOTg4OGYxNTdlYjUx ZTRmMGE4NTg2YTE3MTY5NzYuLjE2OThlMWZlNGVkOTc2NGUyY2M3ODlmNTUzOGQ0MjRiMDI2MTAw ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTktMDctMTUgIE1pY2hhZWwgQ2F0YW56YXJvICA8 bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtXUEVdW0dUS10gSW1wcm92ZW1lbnRz IGFuZCBmaXhlcyBpbiBGaWxlU3lzdGVtR2xpYi5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTgwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBudWxscHRyLgorCisgICAgICAgIEZpeCBhIEdG aWxlSW5mbyBsZWFrIGluIGdldEZpbGVTaXplLgorCisgICAgICAgIFVzZSBHUmVmUHRyIHRvIGNs YXJpZnkgb3duZXJzaGlwIG9mIHRoZSBHRmlsZUlPU3RyZWFtIGluIG9wZW5GaWxlLgorCisgICAg ICAgICogd3RmL2dsaWIvRmlsZVN5c3RlbUdsaWIuY3BwOgorICAgICAgICAoV1RGOjpGaWxlU3lz dGVtSW1wbDo6Z2V0RmlsZVNpemUpOgorICAgICAgICAoV1RGOjpGaWxlU3lzdGVtSW1wbDo6Z2V0 Vm9sdW1lRnJlZVNwYWNlKToKKyAgICAgICAgKFdURjo6RmlsZVN5c3RlbUltcGw6Om9wZW5UZW1w b3JhcnlGaWxlKToKKyAgICAgICAgKFdURjo6RmlsZVN5c3RlbUltcGw6Om9wZW5GaWxlKToKKyAg ICAgICAgKFdURjo6RmlsZVN5c3RlbUltcGw6OnNlZWtGaWxlKToKKyAgICAgICAgKFdURjo6Rmls ZVN5c3RlbUltcGw6OndyaXRlVG9GaWxlKToKKyAgICAgICAgKFdURjo6RmlsZVN5c3RlbUltcGw6 OnJlYWRGcm9tRmlsZSk6CisKIDIwMTktMDctMTEgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZp ZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBOZXcgWW9yayBmb250IGVycm9uZW91c2x5IGdldHMg c3ludGhldGljIGJvbGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL2dsaWIvRmlsZVN5c3Rl bUdsaWIuY3BwIGIvU291cmNlL1dURi93dGYvZ2xpYi9GaWxlU3lzdGVtR2xpYi5jcHAKaW5kZXgg OTI0ZmQ3ZGZjNTU1NjM2M2QzOTI2NWUwNTA2MWM2YTc4M2JlYWM0OC4uYTVlMGJhNjI5ZDI5OTBi OWRlNjczOWYyOTRmNmYwNjM5MzAzMzgwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvZ2xp Yi9GaWxlU3lzdGVtR2xpYi5jcHAKKysrIGIvU291cmNlL1dURi93dGYvZ2xpYi9GaWxlU3lzdGVt R2xpYi5jcHAKQEAgLTE2NiwxMSArMTY2LDExIEBAIGJvb2wgZ2V0RmlsZVNpemUoY29uc3QgU3Ry aW5nJiBwYXRoLCBsb25nIGxvbmcmIHJlc3VsdFNpemUpCiAKIGJvb2wgZ2V0RmlsZVNpemUoUGxh dGZvcm1GaWxlSGFuZGxlIGhhbmRsZSwgbG9uZyBsb25nJiByZXN1bHRTaXplKQogewotICAgIGF1 dG8gaW5mbyA9IGdfZmlsZV9pb19zdHJlYW1fcXVlcnlfaW5mbyhoYW5kbGUsIEdfRklMRV9BVFRS SUJVVEVfU1RBTkRBUkRfU0laRSwgbnVsbHB0ciwgbnVsbHB0cik7CisgICAgR1JlZlB0cjxHRmls ZUluZm8+IGluZm8gPSBhZG9wdEdSZWYoZ19maWxlX2lvX3N0cmVhbV9xdWVyeV9pbmZvKGhhbmRs ZSwgR19GSUxFX0FUVFJJQlVURV9TVEFOREFSRF9TSVpFLCBudWxscHRyLCBudWxscHRyKSk7CiAg ICAgaWYgKCFpbmZvKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICByZXN1bHRTaXplID0g Z19maWxlX2luZm9fZ2V0X3NpemUoaW5mbyk7CisgICAgcmVzdWx0U2l6ZSA9IGdfZmlsZV9pbmZv X2dldF9zaXplKGluZm8uZ2V0KCkpOwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC0yODQsNyAr Mjg0LDcgQEAgYm9vbCBnZXRWb2x1bWVGcmVlU3BhY2UoY29uc3QgU3RyaW5nJiBwYXRoLCB1aW50 NjRfdCYgZnJlZVNwYWNlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBHUmVmUHRyPEdG aWxlPiBmaWxlID0gYWRvcHRHUmVmKGdfZmlsZV9uZXdfZm9yX3BhdGgoZmlsZW5hbWUuZGF0YSgp KSk7Ci0gICAgR1JlZlB0cjxHRmlsZUluZm8+IGZpbGVJbmZvID0gYWRvcHRHUmVmKGdfZmlsZV9x dWVyeV9maWxlc3lzdGVtX2luZm8oZmlsZS5nZXQoKSwgR19GSUxFX0FUVFJJQlVURV9GSUxFU1lT VEVNX0ZSRUUsIDAsIDApKTsKKyAgICBHUmVmUHRyPEdGaWxlSW5mbz4gZmlsZUluZm8gPSBhZG9w dEdSZWYoZ19maWxlX3F1ZXJ5X2ZpbGVzeXN0ZW1faW5mbyhmaWxlLmdldCgpLCBHX0ZJTEVfQVRU UklCVVRFX0ZJTEVTWVNURU1fRlJFRSwgbnVsbHB0ciwgbnVsbHB0cikpOwogICAgIGlmICghZmls ZUluZm8pCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtMzI5LDEwICszMjksMTAgQEAgVmVj dG9yPFN0cmluZz4gbGlzdERpcmVjdG9yeShjb25zdCBTdHJpbmcmIHBhdGgsIGNvbnN0IFN0cmlu ZyYgZmlsdGVyKQogU3RyaW5nIG9wZW5UZW1wb3JhcnlGaWxlKGNvbnN0IFN0cmluZyYgcHJlZml4 LCBQbGF0Zm9ybUZpbGVIYW5kbGUmIGhhbmRsZSkKIHsKICAgICBHVW5pcXVlUHRyPGdjaGFyPiBm aWxlbmFtZShnX3N0cmR1cF9wcmludGYoIiVzJXMiLCBwcmVmaXgudXRmOCgpLmRhdGEoKSwgY3Jl YXRlQ2Fub25pY2FsVVVJRFN0cmluZygpLnV0ZjgoKS5kYXRhKCkpKTsKLSAgICBHVW5pcXVlUHRy PGdjaGFyPiB0ZW1wUGF0aChnX2J1aWxkX2ZpbGVuYW1lKGdfZ2V0X3RtcF9kaXIoKSwgZmlsZW5h bWUuZ2V0KCksIE5VTEwpKTsKKyAgICBHVW5pcXVlUHRyPGdjaGFyPiB0ZW1wUGF0aChnX2J1aWxk X2ZpbGVuYW1lKGdfZ2V0X3RtcF9kaXIoKSwgZmlsZW5hbWUuZ2V0KCksIG51bGxwdHIpKTsKICAg ICBHUmVmUHRyPEdGaWxlPiBmaWxlID0gYWRvcHRHUmVmKGdfZmlsZV9uZXdfZm9yX3BhdGgodGVt cFBhdGguZ2V0KCkpKTsKIAotICAgIGhhbmRsZSA9IGdfZmlsZV9jcmVhdGVfcmVhZHdyaXRlKGZp bGUuZ2V0KCksIEdfRklMRV9DUkVBVEVfTk9ORSwgMCwgMCk7CisgICAgaGFuZGxlID0gZ19maWxl X2NyZWF0ZV9yZWFkd3JpdGUoZmlsZS5nZXQoKSwgR19GSUxFX0NSRUFURV9OT05FLCBudWxscHRy LCBudWxscHRyKTsKICAgICBpZiAoIWlzSGFuZGxlVmFsaWQoaGFuZGxlKSkKICAgICAgICAgcmV0 dXJuIFN0cmluZygpOwogICAgIHJldHVybiBTdHJpbmc6OmZyb21VVEY4KHRlbXBQYXRoLmdldCgp KTsKQEAgLTM0NSwxNyArMzQ1LDE3IEBAIFBsYXRmb3JtRmlsZUhhbmRsZSBvcGVuRmlsZShjb25z dCBTdHJpbmcmIHBhdGgsIEZpbGVPcGVuTW9kZSBtb2RlKQogICAgICAgICByZXR1cm4gaW52YWxp ZFBsYXRmb3JtRmlsZUhhbmRsZTsKIAogICAgIEdSZWZQdHI8R0ZpbGU+IGZpbGUgPSBhZG9wdEdS ZWYoZ19maWxlX25ld19mb3JfcGF0aChmaWxlbmFtZS5kYXRhKCkpKTsKLSAgICBHRmlsZUlPU3Ry ZWFtKiBpb1N0cmVhbSA9IDA7CisgICAgR1JlZlB0cjxHRmlsZUlPU3RyZWFtPiBpb1N0cmVhbTsK ICAgICBpZiAobW9kZSA9PSBGaWxlT3Blbk1vZGU6OlJlYWQpCi0gICAgICAgIGlvU3RyZWFtID0g Z19maWxlX29wZW5fcmVhZHdyaXRlKGZpbGUuZ2V0KCksIDAsIDApOworICAgICAgICBpb1N0cmVh bSA9IGFkb3B0R1JlZihnX2ZpbGVfb3Blbl9yZWFkd3JpdGUoZmlsZS5nZXQoKSwgbnVsbHB0ciwg bnVsbHB0cikpOwogICAgIGVsc2UgaWYgKG1vZGUgPT0gRmlsZU9wZW5Nb2RlOjpXcml0ZSkgewog ICAgICAgICBpZiAoZ19maWxlX3Rlc3QoZmlsZW5hbWUuZGF0YSgpLCBzdGF0aWNfY2FzdDxHRmls ZVRlc3Q+KEdfRklMRV9URVNUX0VYSVNUUyB8IEdfRklMRV9URVNUX0lTX1JFR1VMQVIpKSkKLSAg ICAgICAgICAgIGlvU3RyZWFtID0gZ19maWxlX29wZW5fcmVhZHdyaXRlKGZpbGUuZ2V0KCksIDAs IDApOworICAgICAgICAgICAgaW9TdHJlYW0gPSBhZG9wdEdSZWYoZ19maWxlX29wZW5fcmVhZHdy aXRlKGZpbGUuZ2V0KCksIG51bGxwdHIsIG51bGxwdHIpKTsKICAgICAgICAgZWxzZQotICAgICAg ICAgICAgaW9TdHJlYW0gPSBnX2ZpbGVfY3JlYXRlX3JlYWR3cml0ZShmaWxlLmdldCgpLCBHX0ZJ TEVfQ1JFQVRFX05PTkUsIDAsIDApOworICAgICAgICAgICAgaW9TdHJlYW0gPSBhZG9wdEdSZWYo Z19maWxlX2NyZWF0ZV9yZWFkd3JpdGUoZmlsZS5nZXQoKSwgR19GSUxFX0NSRUFURV9OT05FLCBu dWxscHRyLCBudWxscHRyKSk7CiAgICAgfQogCi0gICAgcmV0dXJuIGlvU3RyZWFtOworICAgIHJl dHVybiBpb1N0cmVhbS5sZWFrUmVmKCk7CiB9CiAKIHZvaWQgY2xvc2VGaWxlKFBsYXRmb3JtRmls ZUhhbmRsZSYgaGFuZGxlKQpAQCAtMzg1LDExICszODUsOCBAQCBsb25nIGxvbmcgc2Vla0ZpbGUo UGxhdGZvcm1GaWxlSGFuZGxlIGhhbmRsZSwgbG9uZyBsb25nIG9mZnNldCwgRmlsZVNlZWtPcmln aW4gbwogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9CiAKLSAgICBpZiAoIWdf c2Vla2FibGVfc2VlayhHX1NFRUtBQkxFKGdfaW9fc3RyZWFtX2dldF9pbnB1dF9zdHJlYW0oR19J T19TVFJFQU0oaGFuZGxlKSkpLAotICAgICAgICBvZmZzZXQsIHNlZWtUeXBlLCAwLCAwKSkKLSAg ICB7CisgICAgaWYgKCFnX3NlZWthYmxlX3NlZWsoR19TRUVLQUJMRShnX2lvX3N0cmVhbV9nZXRf aW5wdXRfc3RyZWFtKEdfSU9fU1RSRUFNKGhhbmRsZSkpKSwgb2Zmc2V0LCBzZWVrVHlwZSwgbnVs bHB0ciwgbnVsbHB0cikpCiAgICAgICAgIHJldHVybiAtMTsKLSAgICB9CiAgICAgcmV0dXJuIGdf c2Vla2FibGVfdGVsbChHX1NFRUtBQkxFKGdfaW9fc3RyZWFtX2dldF9pbnB1dF9zdHJlYW0oR19J T19TVFJFQU0oaGFuZGxlKSkpKTsKIH0KIApAQCAtMzk3LDcgKzM5NCw3IEBAIGludCB3cml0ZVRv RmlsZShQbGF0Zm9ybUZpbGVIYW5kbGUgaGFuZGxlLCBjb25zdCBjaGFyKiBkYXRhLCBpbnQgbGVu Z3RoKQogewogICAgIGdzaXplIGJ5dGVzV3JpdHRlbjsKICAgICBnX291dHB1dF9zdHJlYW1fd3Jp dGVfYWxsKGdfaW9fc3RyZWFtX2dldF9vdXRwdXRfc3RyZWFtKEdfSU9fU1RSRUFNKGhhbmRsZSkp LAotICAgICAgICBkYXRhLCBsZW5ndGgsICZieXRlc1dyaXR0ZW4sIDAsIDApOworICAgICAgICBk YXRhLCBsZW5ndGgsICZieXRlc1dyaXR0ZW4sIG51bGxwdHIsIG51bGxwdHIpOwogICAgIHJldHVy biBieXRlc1dyaXR0ZW47CiB9CiAKQEAgLTQwNiw3ICs0MDMsNyBAQCBpbnQgcmVhZEZyb21GaWxl KFBsYXRmb3JtRmlsZUhhbmRsZSBoYW5kbGUsIGNoYXIqIGRhdGEsIGludCBsZW5ndGgpCiAgICAg R1VuaXF1ZU91dFB0cjxHRXJyb3I+IGVycm9yOwogICAgIGRvIHsKICAgICAgICAgZ3NzaXplIGJ5 dGVzUmVhZCA9IGdfaW5wdXRfc3RyZWFtX3JlYWQoZ19pb19zdHJlYW1fZ2V0X2lucHV0X3N0cmVh bShHX0lPX1NUUkVBTShoYW5kbGUpKSwKLSAgICAgICAgICAgIGRhdGEsIGxlbmd0aCwgMCwgJmVy cm9yLm91dFB0cigpKTsKKyAgICAgICAgICAgIGRhdGEsIGxlbmd0aCwgbnVsbHB0ciwgJmVycm9y Lm91dFB0cigpKTsKICAgICAgICAgaWYgKGJ5dGVzUmVhZCA+PSAwKQogICAgICAgICAgICAgcmV0 dXJuIGJ5dGVzUmVhZDsKICAgICB9IHdoaWxlIChlcnJvciAmJiBlcnJvci0+Y29kZSA9PSBHX0ZJ TEVfRVJST1JfSU5UUik7Cg==