201906 2019-09-17 23:17:16 -0700 [GTK][WPE] Minor code cleanup in BubblewrapLauncher 2019-09-24 16:32:15 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pgriffis pgriffis bugs-noreply cgarcia commit-queue mcatanzaro oldest_to_newest 1571826 0 pgriffis 2019-09-17 23:17:16 -0700 [GTK][WPE] Minor code cleanup in BubblewrapLauncher 1571827 1 379023 pgriffis 2019-09-17 23:18:48 -0700 Created attachment 379023 Patch 1571843 2 379023 cgarcia 2019-09-18 00:55:21 -0700 Comment on attachment 379023 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379023&action=review > Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp:133 > - m_proxyPath = makeProxyPath(appRunDir.get()).get(); > + m_proxyPath = makeProxyPath(appRunDir.get()).release(); What does this clarify? the string is always going to be copied by CString constructor, there's no ownership transfer. I think this would be less confusing if makeProxyPath returned a CString instead of a GUniquePtr<char>. > Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp:136 > - m_path = dbusPath.get(); > + m_path = dbusPath.release(); Same here, dbusAddressToPath should return a CString 1572102 3 mcatanzaro 2019-09-18 14:52:32 -0700 BTW I thought these were UAF vulnerabilities because I didn't realize the CString constructor does a memcpy... so I thought .release() would be clearer and bullied Patrick into changing this. Don't blame him. ;) I agree that using CString throughout will be better. 1572285 4 cgarcia 2019-09-19 00:53:37 -0700 (In reply to Michael Catanzaro from comment #3) > BTW I thought these were UAF vulnerabilities because I didn't realize the > CString constructor does a memcpy... so I thought .release() would be > clearer and bullied Patrick into changing this. Don't blame him. ;) :-) I don't blame anybody in any case, I was just confused by the clarification :-D > I agree that using CString throughout will be better. 1573339 5 379376 pgriffis 2019-09-23 10:13:22 -0700 Created attachment 379376 Patch 1573599 6 379376 cgarcia 2019-09-24 00:42:23 -0700 Comment on attachment 379376 Patch LGTM, it seems it needs to be rebased. 1573765 7 379473 pgriffis 2019-09-24 12:56:55 -0700 Created attachment 379473 Patch 1573885 8 379473 commit-queue 2019-09-24 16:32:14 -0700 Comment on attachment 379473 Patch Clearing flags on attachment: 379473 Committed r250320: <https://trac.webkit.org/changeset/250320> 1573886 9 commit-queue 2019-09-24 16:32:15 -0700 All reviewed patches have been landed. Closing bug. 379023 2019-09-17 23:18:48 -0700 2019-09-23 10:13:21 -0700 Patch bug-201906-20190917231848.patch text/plain 2376 pgriffis U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5ODEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRkMWM1NTQ5ZDJiOGFhY2Fl Y2MxYjE4NTViYjRhNjBiMmMwODJlYTEuLmE1ZDc2ZjlkZjc3NWYyYzRmM2YzMDUyYjE5MzliY2Ux NDAwZDAwZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDktMTcgIFBhdHJpY2sg R3JpZmZpcyAgPHBncmlmZmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11bV1BFXSBNaW5v ciBjb2RlIGNsZWFudXAgaW4gQnViYmxld3JhcExhdW5jaGVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE5MDYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGp1c3QgY2xhcmlmaWVzIHRoZSBsaWZl dGltZSBvZiBzb21lIHN0cmluZ3MgYXMKKyAgICAgICAgd2VsbCBhcyB3aGl0ZXNwYWNlIGZpeGVz LgorCisgICAgICAgICogVUlQcm9jZXNzL0xhdW5jaGVyL2dsaWIvQnViYmxld3JhcExhdW5jaGVy LmNwcDoKKyAgICAgICAgKFdlYktpdDo6WERHREJ1c1Byb3h5TGF1bmNoZXI6OnNldEFkZHJlc3Mp OgorICAgICAgICAoV2ViS2l0OjpYREdEQnVzUHJveHlMYXVuY2hlcjo6bGF1bmNoKToKKwogMjAx OS0wOC0xNSAgUGF0cmljayBHcmlmZmlzICA8cGdyaWZmaXNAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbV1BFXVtHVEtdIEFkZCBzdXBwb3J0IGZvciBjbGllbnQgY2VydGlmaWNhdGUgYXV0aGVudGlj YXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0xhdW5jaGVyL2dsaWIv QnViYmxld3JhcExhdW5jaGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0xhdW5jaGVy L2dsaWIvQnViYmxld3JhcExhdW5jaGVyLmNwcAppbmRleCA4ZDEyNjhhOThjOTJmYTM2MmU0ZTE2 ZWNmNDdkZjVhMmE3YjIzMWNhLi5mMzc0NzY5ZTA4NjY4MGIyZWNlZTBhODNhZWMxNzBjMjkzYWEx NDRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9MYXVuY2hlci9nbGliL0J1 YmJsZXdyYXBMYXVuY2hlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTGF1bmNo ZXIvZ2xpYi9CdWJibGV3cmFwTGF1bmNoZXIuY3BwCkBAIC0xMzAsMTAgKzEzMCwxMCBAQCBwdWJs aWM6CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgR1VuaXF1ZVB0cjxjaGFyPiBhcHBS dW5EaXIoZ19idWlsZF9maWxlbmFtZShnX2dldF91c2VyX3J1bnRpbWVfZGlyKCksIGdfZ2V0X3By Z25hbWUoKSwgbnVsbHB0cikpOwotICAgICAgICBtX3Byb3h5UGF0aCA9IG1ha2VQcm94eVBhdGgo YXBwUnVuRGlyLmdldCgpKS5nZXQoKTsKKyAgICAgICAgbV9wcm94eVBhdGggPSBtYWtlUHJveHlQ YXRoKGFwcFJ1bkRpci5nZXQoKSkucmVsZWFzZSgpOwogCiAgICAgICAgIG1fc29ja2V0ID0gZGJ1 c0FkZHJlc3M7Ci0gICAgICAgIG1fcGF0aCA9IGRidXNQYXRoLmdldCgpOworICAgICAgICBtX3Bh dGggPSBkYnVzUGF0aC5yZWxlYXNlKCk7CiAgICAgfQogCiAgICAgYm9vbCBpc1J1bm5pbmcoKSBj b25zdCB7IHJldHVybiBtX2lzUnVubmluZzsgfTsKQEAgLTE1NCw3ICsxNTQsNyBAQCBwdWJsaWM6 CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgaW50IHN5bmNGZHNbMl07Ci0gICAgICAg IGlmIChwaXBlMiAoc3luY0ZkcywgT19DTE9FWEVDKSA9PSAtMSkKKyAgICAgICAgaWYgKHBpcGUy KHN5bmNGZHMsIE9fQ0xPRVhFQykgPT0gLTEpCiAgICAgICAgICAgICBnX2Vycm9yKCJGYWlsZWQg dG8gbWFrZSBzeW5jZmRzIGZvciBkYnVzLXByb3h5OiAlcyIsIGdfc3RyZXJyb3IoZXJybm8pKTsK IAogICAgICAgICBHVW5pcXVlUHRyPGNoYXI+IHN5bmNGZFN0cihnX3N0cmR1cF9wcmludGYoIi0t ZmQ9JWQiLCBzeW5jRmRzWzFdKSk7CkBAIC0yMDAsNyArMjAwLDcgQEAgcHVibGljOgogICAgICAg ICBjaGFyIG91dDsKICAgICAgICAgLy8gV2UgbmVlZCB0byBlbnN1cmUgdGhlIHByb3h5IGhhcyBj cmVhdGVkIHRoZSBzb2NrZXQuCiAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGlzIG1vcmUgYmxvY2tp bmcgSU8uCi0gICAgICAgIGlmIChyZWFkIChzeW5jRmRzWzBdLCAmb3V0LCAxKSAhPSAxKQorICAg ICAgICBpZiAocmVhZChzeW5jRmRzWzBdLCAmb3V0LCAxKSAhPSAxKQogICAgICAgICAgICAgZ19l cnJvcigiRmFpbGVkIHRvIGZ1bGx5IGxhdW5jaCBkYnVzLXByb3h5ICVzIiwgZ19zdHJlcnJvcihl cnJubykpOwogCiAgICAgICAgIG1faXNSdW5uaW5nID0gdHJ1ZTsK 379376 2019-09-23 10:13:22 -0700 2019-09-24 12:56:54 -0700 Patch bug-201906-20190923101321.patch text/plain 4727 pgriffis U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5ODEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJlMmM3NGNlY2NjMTFiY2Nh ZDk1ZjNlYWVlZWNmNmI5MmI1YTI0ZTEuLjZhZjEzYWVmZWExN2I4MGZiZDA0Y2YyZDA2NTEyMWI3 YjFjYzJkYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTktMDktMjMgIFBhdHJpY2sg R3JpZmZpcyAgPHBncmlmZmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11bV1BFXSBNaW5v ciBjb2RlIGNsZWFudXAgaW4gQnViYmxld3JhcExhdW5jaGVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE5MDYKKworICAgICAgICBUaGlzIGp1c3Qg Y2xlYW5zIHVwIHN0cmluZyBoYW5kbGluZyBhbmQgc29tZQorICAgICAgICB3aGl0ZXNwYWNlIGZp eGVzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VUlQcm9jZXNzL0xhdW5jaGVyL2dsaWIvQnViYmxld3JhcExhdW5jaGVyLmNwcDoKKyAgICAgICAg KFdlYktpdDo6WERHREJ1c1Byb3h5TGF1bmNoZXI6OnNldEFkZHJlc3MpOgorICAgICAgICAoV2Vi S2l0OjpYREdEQnVzUHJveHlMYXVuY2hlcjo6bGF1bmNoKToKKyAgICAgICAgKFdlYktpdDo6WERH REJ1c1Byb3h5TGF1bmNoZXI6Om1ha2VQcm94eVBhdGgpOgorICAgICAgICAoV2ViS2l0OjpYREdE QnVzUHJveHlMYXVuY2hlcjo6ZGJ1c0FkZHJlc3NUb1BhdGgpOgorCiAyMDE5LTA5LTEyICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11b V1BFXSB3ZWJraXRfc2V0dGluZ3Nfc2V0X3VzZXJfYWdlbnQoKSBhbGxvd3MgY29udGVudCBmb3Ji aWRkZW4gaW4gSFRUUCBoZWFkZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9MYXVuY2hlci9nbGliL0J1YmJsZXdyYXBMYXVuY2hlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9MYXVuY2hlci9nbGliL0J1YmJsZXdyYXBMYXVuY2hlci5jcHAKaW5kZXggOGQxMjY4 YTk4YzkyZmEzNjJlNGUxNmVjZjQ3ZGY1YTJhN2IyMzFjYS4uNmJhYzVhZmEzZThkOWUzZDk1MzJl YWU1NzQ1ZWM1ZmI3NDM2N2M3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv TGF1bmNoZXIvZ2xpYi9CdWJibGV3cmFwTGF1bmNoZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0xhdW5jaGVyL2dsaWIvQnViYmxld3JhcExhdW5jaGVyLmNwcApAQCAtMTI1LDE1 ICsxMjUsMTUgQEAgY2xhc3MgWERHREJ1c1Byb3h5TGF1bmNoZXIgewogcHVibGljOgogICAgIHZv aWQgc2V0QWRkcmVzcyhjb25zdCBjaGFyKiBkYnVzQWRkcmVzcywgREJ1c0FkZHJlc3NUeXBlIGFk ZHJlc3NUeXBlKQogICAgIHsKLSAgICAgICAgR1VuaXF1ZVB0cjxjaGFyPiBkYnVzUGF0aCA9IGRi dXNBZGRyZXNzVG9QYXRoKGRidXNBZGRyZXNzLCBhZGRyZXNzVHlwZSk7Ci0gICAgICAgIGlmICgh ZGJ1c1BhdGguZ2V0KCkpCisgICAgICAgIENTdHJpbmcgZGJ1c1BhdGggPSBkYnVzQWRkcmVzc1Rv UGF0aChkYnVzQWRkcmVzcywgYWRkcmVzc1R5cGUpOworICAgICAgICBpZiAoZGJ1c1BhdGguaXNO dWxsKCkpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgR1VuaXF1ZVB0cjxjaGFyPiBh cHBSdW5EaXIoZ19idWlsZF9maWxlbmFtZShnX2dldF91c2VyX3J1bnRpbWVfZGlyKCksIGdfZ2V0 X3ByZ25hbWUoKSwgbnVsbHB0cikpOwotICAgICAgICBtX3Byb3h5UGF0aCA9IG1ha2VQcm94eVBh dGgoYXBwUnVuRGlyLmdldCgpKS5nZXQoKTsKKyAgICAgICAgbV9wcm94eVBhdGggPSBtYWtlUHJv eHlQYXRoKGFwcFJ1bkRpci5nZXQoKSk7CiAKICAgICAgICAgbV9zb2NrZXQgPSBkYnVzQWRkcmVz czsKLSAgICAgICAgbV9wYXRoID0gZGJ1c1BhdGguZ2V0KCk7CisgICAgICAgIG1fcGF0aCA9IFdU Rk1vdmUoZGJ1c1BhdGgpOwogICAgIH0KIAogICAgIGJvb2wgaXNSdW5uaW5nKCkgY29uc3QgeyBy ZXR1cm4gbV9pc1J1bm5pbmc7IH07CkBAIC0xNTQsNyArMTU0LDcgQEAgcHVibGljOgogICAgICAg ICAgICAgcmV0dXJuOwogCiAgICAgICAgIGludCBzeW5jRmRzWzJdOwotICAgICAgICBpZiAocGlw ZTIgKHN5bmNGZHMsIE9fQ0xPRVhFQykgPT0gLTEpCisgICAgICAgIGlmIChwaXBlMihzeW5jRmRz LCBPX0NMT0VYRUMpID09IC0xKQogICAgICAgICAgICAgZ19lcnJvcigiRmFpbGVkIHRvIG1ha2Ug c3luY2ZkcyBmb3IgZGJ1cy1wcm94eTogJXMiLCBnX3N0cmVycm9yKGVycm5vKSk7CiAKICAgICAg ICAgR1VuaXF1ZVB0cjxjaGFyPiBzeW5jRmRTdHIoZ19zdHJkdXBfcHJpbnRmKCItLWZkPSVkIiwg c3luY0Zkc1sxXSkpOwpAQCAtMjAwLDcgKzIwMCw3IEBAIHB1YmxpYzoKICAgICAgICAgY2hhciBv dXQ7CiAgICAgICAgIC8vIFdlIG5lZWQgdG8gZW5zdXJlIHRoZSBwcm94eSBoYXMgY3JlYXRlZCB0 aGUgc29ja2V0LgogICAgICAgICAvLyBGSVhNRTogVGhpcyBpcyBtb3JlIGJsb2NraW5nIElPLgot ICAgICAgICBpZiAocmVhZCAoc3luY0Zkc1swXSwgJm91dCwgMSkgIT0gMSkKKyAgICAgICAgaWYg KHJlYWQoc3luY0Zkc1swXSwgJm91dCwgMSkgIT0gMSkKICAgICAgICAgICAgIGdfZXJyb3IoIkZh aWxlZCB0byBmdWxseSBsYXVuY2ggZGJ1cy1wcm94eSAlcyIsIGdfc3RyZXJyb3IoZXJybm8pKTsK IAogICAgICAgICBtX2lzUnVubmluZyA9IHRydWU7CkBAIC0yMTMsNDIgKzIxMyw0MiBAQCBwcml2 YXRlOgogICAgICAgICBmY250bChmZCwgRl9TRVRGRCwgMCk7IC8vIFVuc2V0IENMT0VYRUMKICAg ICB9CiAKLSAgICBzdGF0aWMgR1VuaXF1ZVB0cjxjaGFyPiBtYWtlUHJveHlQYXRoKGNvbnN0IGNo YXIqIGFwcFJ1bkRpcikKKyAgICBzdGF0aWMgQ1N0cmluZyBtYWtlUHJveHlQYXRoKGNvbnN0IGNo YXIqIGFwcFJ1bkRpcikKICAgICB7CiAgICAgICAgIGlmIChnX21rZGlyX3dpdGhfcGFyZW50cyhh cHBSdW5EaXIsIDA3MDApID09IC0xKSB7CiAgICAgICAgICAgICBnX3dhcm5pbmcoIkZhaWxlZCB0 byBta2RpciBmb3IgZGJ1cyBwcm94eSAoJXMpOiAlcyIsIGFwcFJ1bkRpciwgZ19zdHJlcnJvcihl cnJubykpOwotICAgICAgICAgICAgcmV0dXJuIEdVbmlxdWVQdHI8Y2hhcj4obnVsbHB0cik7Cisg ICAgICAgICAgICByZXR1cm4geyB9OwogICAgICAgICB9CiAKICAgICAgICAgR1VuaXF1ZVB0cjxj aGFyPiBwcm94eVNvY2tldFRlbXBsYXRlKGdfYnVpbGRfZmlsZW5hbWUoYXBwUnVuRGlyLCAiZGJ1 cy1wcm94eS1YWFhYWFgiLCBudWxscHRyKSk7CiAgICAgICAgIGludCBmZDsKICAgICAgICAgaWYg KChmZCA9IGdfbWtzdGVtcChwcm94eVNvY2tldFRlbXBsYXRlLmdldCgpKSkgPT0gLTEpIHsKICAg ICAgICAgICAgIGdfd2FybmluZygiRmFpbGVkIHRvIG1ha2Ugc29ja2V0IGZpbGUgZm9yIGRidXMg cHJveHk6ICVzIiwgZ19zdHJlcnJvcihlcnJubykpOwotICAgICAgICAgICAgcmV0dXJuIEdVbmlx dWVQdHI8Y2hhcj4obnVsbHB0cik7CisgICAgICAgICAgICByZXR1cm4geyB9OwogICAgICAgICB9 CiAKICAgICAgICAgY2xvc2UoZmQpOwotICAgICAgICByZXR1cm4gcHJveHlTb2NrZXRUZW1wbGF0 ZTsKKyAgICAgICAgcmV0dXJuIENTdHJpbmcocHJveHlTb2NrZXRUZW1wbGF0ZS5nZXQoKSk7CiAg ICAgfTsKIAotICAgIHN0YXRpYyBHVW5pcXVlUHRyPGNoYXI+IGRidXNBZGRyZXNzVG9QYXRoKGNv bnN0IGNoYXIqIGFkZHJlc3MsIERCdXNBZGRyZXNzVHlwZSBhZGRyZXNzVHlwZSA9IERCdXNBZGRy ZXNzVHlwZTo6Tm9ybWFsKQorICAgIHN0YXRpYyBDU3RyaW5nIGRidXNBZGRyZXNzVG9QYXRoKGNv bnN0IGNoYXIqIGFkZHJlc3MsIERCdXNBZGRyZXNzVHlwZSBhZGRyZXNzVHlwZSA9IERCdXNBZGRy ZXNzVHlwZTo6Tm9ybWFsKQogICAgIHsKICAgICAgICAgaWYgKCFhZGRyZXNzKQotICAgICAgICAg ICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgICAgICByZXR1cm4geyB9OwogCiAgICAgICAgIGlm ICghZ19zdHJfaGFzX3ByZWZpeChhZGRyZXNzLCAidW5peDoiKSkKLSAgICAgICAgICAgIHJldHVy biBudWxscHRyOworICAgICAgICAgICAgcmV0dXJuIHsgfTsKIAogICAgICAgICBjb25zdCBjaGFy KiBwYXRoID0gc3Ryc3RyKGFkZHJlc3MsIGFkZHJlc3NUeXBlID09IERCdXNBZGRyZXNzVHlwZTo6 QWJzdHJhY3QgPyAiYWJzdHJhY3Q9IiA6ICJwYXRoPSIpOwogICAgICAgICBpZiAoIXBhdGgpCi0g ICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgICAgIHJldHVybiB7IH07CiAKICAg ICAgICAgcGF0aCArPSBzdHJsZW4oYWRkcmVzc1R5cGUgPT0gREJ1c0FkZHJlc3NUeXBlOjpBYnN0 cmFjdCA/ICJhYnN0cmFjdD0iIDogInBhdGg9Iik7CiAgICAgICAgIGNvbnN0IGNoYXIqIHBhdGhF bmQgPSBwYXRoOwogICAgICAgICB3aGlsZSAoKnBhdGhFbmQgJiYgKnBhdGhFbmQgIT0gJywnKQog ICAgICAgICAgICAgcGF0aEVuZCsrOwogCi0gICAgICAgIHJldHVybiBHVW5pcXVlUHRyPGNoYXI+ KGdfc3RybmR1cChwYXRoLCBwYXRoRW5kIC0gcGF0aCkpOworICAgICAgICByZXR1cm4gQ1N0cmlu ZyhwYXRoLCBwYXRoRW5kIC0gcGF0aCk7CiB9CiAKICAgICBDU3RyaW5nIG1fc29ja2V0Owo= 379473 2019-09-24 12:56:55 -0700 2019-09-24 16:32:14 -0700 Patch bug-201906-20190924125654.patch text/plain 4699 pgriffis U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMzE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGExOGJiNTUzZTY2ZWQ4NDMy MWIyZjc5ZWVhZmIxYTQ3Y2JhODU2MGUuLmQ0MThiYmJmNjk2M2U1ZTM3MWU0YmZiZGY3MjMxYjRh YTE0NjE1NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTktMDktMjQgIFBhdHJpY2sg R3JpZmZpcyAgPHBncmlmZmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11bV1BFXSBNaW5v ciBjb2RlIGNsZWFudXAgaW4gQnViYmxld3JhcExhdW5jaGVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE5MDYKKworICAgICAgICBUaGlzIGp1c3Qg Y2xlYW5zIHVwIHN0cmluZyBoYW5kbGluZyBhbmQgc29tZQorICAgICAgICB3aGl0ZXNwYWNlIGZp eGVzLgorCisgICAgICAgIFJldmlld2VkIGJ5IENhcmxvcyBHYXJjaWEgQ2FtcG9zLgorCisgICAg ICAgICogVUlQcm9jZXNzL0xhdW5jaGVyL2dsaWIvQnViYmxld3JhcExhdW5jaGVyLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6WERHREJ1c1Byb3h5TGF1bmNoZXI6OnNldEFkZHJlc3MpOgorICAgICAg ICAoV2ViS2l0OjpYREdEQnVzUHJveHlMYXVuY2hlcjo6bGF1bmNoKToKKyAgICAgICAgKFdlYktp dDo6WERHREJ1c1Byb3h5TGF1bmNoZXI6Om1ha2VQcm94eVBhdGgpOgorICAgICAgICAoV2ViS2l0 OjpYREdEQnVzUHJveHlMYXVuY2hlcjo6ZGJ1c0FkZHJlc3NUb1BhdGgpOgorCiAyMDE5LTA5LTI0 ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAg TW92ZSBIU1RTIHN0b3JhZ2UgZGlyZWN0b3J5IHRvIExlZ2FjeUdsb2JhbFNldHRpbmdzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9MYXVuY2hlci9nbGliL0J1YmJsZXdyYXBM YXVuY2hlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9MYXVuY2hlci9nbGliL0J1YmJs ZXdyYXBMYXVuY2hlci5jcHAKaW5kZXggY2M4YTM5ZDY1MWFjZmY5ZDY4ZTAwMDU5MDZjYjVhMzQx ZmQ1N2Y0OC4uYTQzYTEzOTU4MmEyMDRlYjdmMTRiZjdjYzViYjVkMmMzZjRmNzg2YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTGF1bmNoZXIvZ2xpYi9CdWJibGV3cmFwTGF1 bmNoZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0xhdW5jaGVyL2dsaWIvQnVi Ymxld3JhcExhdW5jaGVyLmNwcApAQCAtMTMxLDE1ICsxMzEsMTUgQEAgY2xhc3MgWERHREJ1c1By b3h5TGF1bmNoZXIgewogcHVibGljOgogICAgIHZvaWQgc2V0QWRkcmVzcyhjb25zdCBjaGFyKiBk YnVzQWRkcmVzcywgREJ1c0FkZHJlc3NUeXBlIGFkZHJlc3NUeXBlKQogICAgIHsKLSAgICAgICAg R1VuaXF1ZVB0cjxjaGFyPiBkYnVzUGF0aCA9IGRidXNBZGRyZXNzVG9QYXRoKGRidXNBZGRyZXNz LCBhZGRyZXNzVHlwZSk7Ci0gICAgICAgIGlmICghZGJ1c1BhdGguZ2V0KCkpCisgICAgICAgIENT dHJpbmcgZGJ1c1BhdGggPSBkYnVzQWRkcmVzc1RvUGF0aChkYnVzQWRkcmVzcywgYWRkcmVzc1R5 cGUpOworICAgICAgICBpZiAoZGJ1c1BhdGguaXNOdWxsKCkpCiAgICAgICAgICAgICByZXR1cm47 CiAKICAgICAgICAgR1VuaXF1ZVB0cjxjaGFyPiBhcHBSdW5EaXIoZ19idWlsZF9maWxlbmFtZShn X2dldF91c2VyX3J1bnRpbWVfZGlyKCksIEJBU0VfRElSRUNUT1JZLCBudWxscHRyKSk7Ci0gICAg ICAgIG1fcHJveHlQYXRoID0gbWFrZVByb3h5UGF0aChhcHBSdW5EaXIuZ2V0KCkpLmdldCgpOwor ICAgICAgICBtX3Byb3h5UGF0aCA9IG1ha2VQcm94eVBhdGgoYXBwUnVuRGlyLmdldCgpKTsKIAog ICAgICAgICBtX3NvY2tldCA9IGRidXNBZGRyZXNzOwotICAgICAgICBtX3BhdGggPSBkYnVzUGF0 aC5nZXQoKTsKKyAgICAgICAgbV9wYXRoID0gV1RGTW92ZShkYnVzUGF0aCk7CiAgICAgfQogCiAg ICAgYm9vbCBpc1J1bm5pbmcoKSBjb25zdCB7IHJldHVybiBtX2lzUnVubmluZzsgfTsKQEAgLTE2 MCw3ICsxNjAsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgaW50 IHN5bmNGZHNbMl07Ci0gICAgICAgIGlmIChwaXBlMiAoc3luY0ZkcywgT19DTE9FWEVDKSA9PSAt MSkKKyAgICAgICAgaWYgKHBpcGUyKHN5bmNGZHMsIE9fQ0xPRVhFQykgPT0gLTEpCiAgICAgICAg ICAgICBnX2Vycm9yKCJGYWlsZWQgdG8gbWFrZSBzeW5jZmRzIGZvciBkYnVzLXByb3h5OiAlcyIs IGdfc3RyZXJyb3IoZXJybm8pKTsKIAogICAgICAgICBHVW5pcXVlUHRyPGNoYXI+IHN5bmNGZFN0 cihnX3N0cmR1cF9wcmludGYoIi0tZmQ9JWQiLCBzeW5jRmRzWzFdKSk7CkBAIC0yMDYsNyArMjA2 LDcgQEAgcHVibGljOgogICAgICAgICBjaGFyIG91dDsKICAgICAgICAgLy8gV2UgbmVlZCB0byBl bnN1cmUgdGhlIHByb3h5IGhhcyBjcmVhdGVkIHRoZSBzb2NrZXQuCiAgICAgICAgIC8vIEZJWE1F OiBUaGlzIGlzIG1vcmUgYmxvY2tpbmcgSU8uCi0gICAgICAgIGlmIChyZWFkIChzeW5jRmRzWzBd LCAmb3V0LCAxKSAhPSAxKQorICAgICAgICBpZiAocmVhZChzeW5jRmRzWzBdLCAmb3V0LCAxKSAh PSAxKQogICAgICAgICAgICAgZ19lcnJvcigiRmFpbGVkIHRvIGZ1bGx5IGxhdW5jaCBkYnVzLXBy b3h5ICVzIiwgZ19zdHJlcnJvcihlcnJubykpOwogCiAgICAgICAgIG1faXNSdW5uaW5nID0gdHJ1 ZTsKQEAgLTIxOSw0MiArMjE5LDQyIEBAIHByaXZhdGU6CiAgICAgICAgIGZjbnRsKGZkLCBGX1NF VEZELCAwKTsgLy8gVW5zZXQgQ0xPRVhFQwogICAgIH0KIAotICAgIHN0YXRpYyBHVW5pcXVlUHRy PGNoYXI+IG1ha2VQcm94eVBhdGgoY29uc3QgY2hhciogYXBwUnVuRGlyKQorICAgIHN0YXRpYyBD U3RyaW5nIG1ha2VQcm94eVBhdGgoY29uc3QgY2hhciogYXBwUnVuRGlyKQogICAgIHsKICAgICAg ICAgaWYgKGdfbWtkaXJfd2l0aF9wYXJlbnRzKGFwcFJ1bkRpciwgMDcwMCkgPT0gLTEpIHsKICAg ICAgICAgICAgIGdfd2FybmluZygiRmFpbGVkIHRvIG1rZGlyIGZvciBkYnVzIHByb3h5ICglcyk6 ICVzIiwgYXBwUnVuRGlyLCBnX3N0cmVycm9yKGVycm5vKSk7Ci0gICAgICAgICAgICByZXR1cm4g R1VuaXF1ZVB0cjxjaGFyPihudWxscHRyKTsKKyAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAg ICAgIH0KIAogICAgICAgICBHVW5pcXVlUHRyPGNoYXI+IHByb3h5U29ja2V0VGVtcGxhdGUoZ19i dWlsZF9maWxlbmFtZShhcHBSdW5EaXIsICJkYnVzLXByb3h5LVhYWFhYWCIsIG51bGxwdHIpKTsK ICAgICAgICAgaW50IGZkOwogICAgICAgICBpZiAoKGZkID0gZ19ta3N0ZW1wKHByb3h5U29ja2V0 VGVtcGxhdGUuZ2V0KCkpKSA9PSAtMSkgewogICAgICAgICAgICAgZ193YXJuaW5nKCJGYWlsZWQg dG8gbWFrZSBzb2NrZXQgZmlsZSBmb3IgZGJ1cyBwcm94eTogJXMiLCBnX3N0cmVycm9yKGVycm5v KSk7Ci0gICAgICAgICAgICByZXR1cm4gR1VuaXF1ZVB0cjxjaGFyPihudWxscHRyKTsKKyAgICAg ICAgICAgIHJldHVybiB7IH07CiAgICAgICAgIH0KIAogICAgICAgICBjbG9zZShmZCk7Ci0gICAg ICAgIHJldHVybiBwcm94eVNvY2tldFRlbXBsYXRlOworICAgICAgICByZXR1cm4gQ1N0cmluZyhw cm94eVNvY2tldFRlbXBsYXRlLmdldCgpKTsKICAgICB9OwogCi0gICAgc3RhdGljIEdVbmlxdWVQ dHI8Y2hhcj4gZGJ1c0FkZHJlc3NUb1BhdGgoY29uc3QgY2hhciogYWRkcmVzcywgREJ1c0FkZHJl c3NUeXBlIGFkZHJlc3NUeXBlID0gREJ1c0FkZHJlc3NUeXBlOjpOb3JtYWwpCisgICAgc3RhdGlj IENTdHJpbmcgZGJ1c0FkZHJlc3NUb1BhdGgoY29uc3QgY2hhciogYWRkcmVzcywgREJ1c0FkZHJl c3NUeXBlIGFkZHJlc3NUeXBlID0gREJ1c0FkZHJlc3NUeXBlOjpOb3JtYWwpCiAgICAgewogICAg ICAgICBpZiAoIWFkZHJlc3MpCi0gICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAg ICAgIHJldHVybiB7IH07CiAKICAgICAgICAgaWYgKCFnX3N0cl9oYXNfcHJlZml4KGFkZHJlc3Ms ICJ1bml4OiIpKQotICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgICAgICByZXR1 cm4geyB9OwogCiAgICAgICAgIGNvbnN0IGNoYXIqIHBhdGggPSBzdHJzdHIoYWRkcmVzcywgYWRk cmVzc1R5cGUgPT0gREJ1c0FkZHJlc3NUeXBlOjpBYnN0cmFjdCA/ICJhYnN0cmFjdD0iIDogInBh dGg9Iik7CiAgICAgICAgIGlmICghcGF0aCkKLSAgICAgICAgICAgIHJldHVybiBudWxscHRyOwor ICAgICAgICAgICAgcmV0dXJuIHsgfTsKIAogICAgICAgICBwYXRoICs9IHN0cmxlbihhZGRyZXNz VHlwZSA9PSBEQnVzQWRkcmVzc1R5cGU6OkFic3RyYWN0ID8gImFic3RyYWN0PSIgOiAicGF0aD0i KTsKICAgICAgICAgY29uc3QgY2hhciogcGF0aEVuZCA9IHBhdGg7CiAgICAgICAgIHdoaWxlICgq cGF0aEVuZCAmJiAqcGF0aEVuZCAhPSAnLCcpCiAgICAgICAgICAgICBwYXRoRW5kKys7CiAKLSAg ICAgICAgcmV0dXJuIEdVbmlxdWVQdHI8Y2hhcj4oZ19zdHJuZHVwKHBhdGgsIHBhdGhFbmQgLSBw YXRoKSk7CisgICAgICAgIHJldHVybiBDU3RyaW5nKHBhdGgsIHBhdGhFbmQgLSBwYXRoKTsKIH0K IAogICAgIENTdHJpbmcgbV9zb2NrZXQ7Cg==