160281 2016-07-27 18:42:45 -0700 [soup] Incorrect usage of relaxAdoptionRequirement in the constructor of SocketStreamHandle 2016-07-27 23:29:29 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=160229 P2 Normal --- 1 fujii webkit-unassigned achristensen alex beidson cgarcia commit-queue darin zan oldest_to_newest 1215115 0 fujii 2016-07-27 18:42:45 -0700 (Bug 160229 Comment #6) > View in context: > https://bugs.webkit.org/attachment.cgi?id=284672&action=review > > > Source/WebCore/ChangeLog:11 > > + An assertion fails because refcount of SocketStreamHandle is > > + incremented before adoptRef, in the constructor of > > + SocketStreamHandle. The constructor of SocketStreamHandle needs > > + to increment recount because it passes this pointer to libsoup. > > This is an incorrect solution; relaxAdoptionRequirement should *not* be used > here. The correct solution is to make the constructor private and make a > public creation function which does the rest of the job of initializing the > object, *after* the constructor has run and we have the object pointer > inside a Ref already. 1215123 1 284752 fujii 2016-07-27 20:32:52 -0700 Created attachment 284752 Patch 1215144 2 284752 cgarcia 2016-07-27 23:07:17 -0700 Comment on attachment 284752 Patch Excellent! thank you 1215147 3 284752 commit-queue 2016-07-27 23:29:24 -0700 Comment on attachment 284752 Patch Clearing flags on attachment: 284752 Committed r203813: <http://trac.webkit.org/changeset/203813> 1215148 4 commit-queue 2016-07-27 23:29:29 -0700 All reviewed patches have been landed. Closing bug. 284752 2016-07-27 20:32:52 -0700 2016-07-27 23:29:24 -0700 Patch bug-160281-20160727203140.patch text/plain 5875 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzNzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2MxZWJjMTgxNzE2YjVj YThlNTAyNjJjYWUyMWEyNWY4MjAzYmU2Yi4uNGUzOWRhODQ5Y2M1Njc5MzhlOWU4YTJhYWI4NjU2 MjE2MTRkMGVkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE2LTA3LTI3ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtzb3VwXSBJ bmNvcnJlY3QgdXNhZ2Ugb2YgcmVsYXhBZG9wdGlvblJlcXVpcmVtZW50IGluIHRoZSBjb25zdHJ1 Y3RvciBvZiBTb2NrZXRTdHJlYW1IYW5kbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE2MDI4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoTm8gYmVoYXZpb3IgY2hhbmdlKS4KKwor ICAgICAgICBJbmNyZW1lbnRpbmcgcmVmY291bnQgaW4gYSBjb25zdHJ1Y3RvciBjYXVzZXMgYW4g YXNzZXJ0aW9uIGZhaWx1cmUKKyAgICAgICAgdGhhdCBpdCdzIG5vdCBhZG9wdGVkIHlldC4gIFNv LCByZWxheEFkb3B0aW9uUmVxdWlyZW1lbnQoKSB3YXMKKyAgICAgICAgdXNlZCB0byBhdm9pZCB0 aGUgcHJvYmxlbSBpbiB0aGUgY29uc3RydWN0b3JzIG9mCisgICAgICAgIFNvY2tldFN0cmVhbUhh bmRsZS4gIFRoaXMgaXMgYSBpbmNvcnJlY3Qgc29sdXRpb24uIFRoZSBjb3JyZWN0CisgICAgICAg IHNvbHV0aW9uIGlzIHRvIG1ha2UgU29ja2V0U3RyZWFtSGFuZGxlOjpjcmVhdGUoKSBpbmNyZW1l bnQgdGhlCisgICAgICAgIHJlZmNvdW50IGFmdGVyIGNhbGxpbmcgdGhlIGNvbnN0cnVjdG9yLgor CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvY2tldFN0cmVhbUhhbmRsZS5oOiBS ZW1vdmVkIHRoZSBzZWNvbmQKKyAgICAgICAgY29uc3RydWN0b3Igb2YgU29ja2V0U3RyZWFtSGFu ZGxlIHdoaWNoIGlzIG5vdCB1c2VkIGFueW1vcmUuCisgICAgICAgIFVuaW5saW5lZCBjcmVhdGUo KSBiZWNhdXNlIHRoaXMgaXMgbm90IHRyaXZpYWwgYW55bW9yZS4KKyAgICAgICAgKiBwbGF0Zm9y bS9uZXR3b3JrL3NvdXAvU29ja2V0U3RyZWFtSGFuZGxlU291cC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTb2NrZXRTdHJlYW1IYW5kbGU6OmNyZWF0ZSk6IERvIHRoZSByZXN0IG9mIGpvYnMgd2hp Y2gKKyAgICAgICAgd2FzIGRvbmUgYnkgdGhlIGNvbnN0cnVjdG9ycy4KKyAgICAgICAgKFdlYkNv cmU6OlNvY2tldFN0cmVhbUhhbmRsZTo6U29ja2V0U3RyZWFtSGFuZGxlKTogTW92ZSB0aGUgam9i cworICAgICAgICBhZnRlciBpbml0aWFsaXphdGlvbiB0byBjcmVhdGUoKS4KKyAgICAgICAgUmVt b3ZlZCB0aGUgc2Vjb25kIGNvbnN0cnVjdG9yLgorCiAyMDE2LTA3LTI3ICBSb21haW4gQmVsbGVz c29ydCAgPHJvbWFpbi5iZWxsZXNzb3J0QGNyZi5jYW5vbi5mcj4KIAogICAgICAgICBbU3RyZWFt cyBBUEldIFJlcGxhY2UgUmVhZGFibGVTdHJlYW1SZWFkZXIgYnkgUmVhZGFibGVTdHJlYW1EZWZh dWx0UmVhZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3Nv dXAvU29ja2V0U3RyZWFtSGFuZGxlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L3NvdXAvU29ja2V0U3RyZWFtSGFuZGxlLmgKaW5kZXggNWNmYWJlZmMwYmMwMDA0MWY0ZTE3ODlj Yjc5ZTNmNzJhMjE4M2VhZC4uZTk4MTg1ZDVmZjg2ZDgxMWNlNzZiZjcwNTBjYzVmZTgzNGJhZDQ0 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvY2tl dFN0cmVhbUhhbmRsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291 cC9Tb2NrZXRTdHJlYW1IYW5kbGUuaApAQCAtNDksMTQgKzQ5LDEzIEBAIGNsYXNzIFNvY2tldFN0 cmVhbUhhbmRsZUNsaWVudDsKIAogY2xhc3MgU29ja2V0U3RyZWFtSGFuZGxlIGZpbmFsIDogcHVi bGljIFJlZkNvdW50ZWQ8U29ja2V0U3RyZWFtSGFuZGxlPiwgcHVibGljIFNvY2tldFN0cmVhbUhh bmRsZUJhc2UgewogcHVibGljOgotICAgIHN0YXRpYyBSZWY8U29ja2V0U3RyZWFtSGFuZGxlPiBj cmVhdGUoY29uc3QgVVJMJiB1cmwsIFNvY2tldFN0cmVhbUhhbmRsZUNsaWVudCYgY2xpZW50LCBO ZXR3b3JraW5nQ29udGV4dCYsIFNlc3Npb25JRCkgeyByZXR1cm4gYWRvcHRSZWYoKm5ldyBTb2Nr ZXRTdHJlYW1IYW5kbGUodXJsLCBjbGllbnQpKTsgfQotICAgIHN0YXRpYyBSZWY8U29ja2V0U3Ry ZWFtSGFuZGxlPiBjcmVhdGUoR1NvY2tldENvbm5lY3Rpb24qIHNvY2tldENvbm5lY3Rpb24sIFNv Y2tldFN0cmVhbUhhbmRsZUNsaWVudCYgY2xpZW50KSB7IHJldHVybiBhZG9wdFJlZigqbmV3IFNv Y2tldFN0cmVhbUhhbmRsZShzb2NrZXRDb25uZWN0aW9uLCBjbGllbnQpKTsgfQorICAgIHN0YXRp YyBSZWY8U29ja2V0U3RyZWFtSGFuZGxlPiBjcmVhdGUoY29uc3QgVVJMJiwgU29ja2V0U3RyZWFt SGFuZGxlQ2xpZW50JiwgTmV0d29ya2luZ0NvbnRleHQmLCBTZXNzaW9uSUQpOworICAgIHN0YXRp YyBSZWY8U29ja2V0U3RyZWFtSGFuZGxlPiBjcmVhdGUoR1NvY2tldENvbm5lY3Rpb24qLCBTb2Nr ZXRTdHJlYW1IYW5kbGVDbGllbnQmKTsKIAogICAgIHZpcnR1YWwgflNvY2tldFN0cmVhbUhhbmRs ZSgpOwogCiBwcml2YXRlOgogICAgIFNvY2tldFN0cmVhbUhhbmRsZShjb25zdCBVUkwmLCBTb2Nr ZXRTdHJlYW1IYW5kbGVDbGllbnQmKTsKLSAgICBTb2NrZXRTdHJlYW1IYW5kbGUoR1NvY2tldENv bm5lY3Rpb24qLCBTb2NrZXRTdHJlYW1IYW5kbGVDbGllbnQmKTsKIAogICAgIGludCBwbGF0Zm9y bVNlbmQoY29uc3QgY2hhciogZGF0YSwgaW50IGxlbmd0aCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBw bGF0Zm9ybUNsb3NlKCkgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL3NvdXAvU29ja2V0U3RyZWFtSGFuZGxlU291cC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvU29ja2V0U3RyZWFtSGFuZGxlU291cC5jcHAKaW5k ZXggYjNkMGQ0ODI2YWJlOTNlMGI4ZjBmMjQ0MzIxYjVjNWVlZTExNWY4MS4uY2I1YjdiYjNlMGE2 OGNlMjdmODY4ZmE0M2UwYjhhZWEzMzdlMWMwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9zb3VwL1NvY2tldFN0cmVhbUhhbmRsZVNvdXAuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Tb2NrZXRTdHJlYW1IYW5kbGVTb3Vw LmNwcApAQCAtNDgsMzAgKzQ4LDM0IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotU29ja2V0 U3RyZWFtSGFuZGxlOjpTb2NrZXRTdHJlYW1IYW5kbGUoY29uc3QgVVJMJiB1cmwsIFNvY2tldFN0 cmVhbUhhbmRsZUNsaWVudCYgY2xpZW50KQotICAgIDogU29ja2V0U3RyZWFtSGFuZGxlQmFzZSh1 cmwsIGNsaWVudCkKLSAgICAsIG1fY2FuY2VsbGFibGUoYWRvcHRHUmVmKGdfY2FuY2VsbGFibGVf bmV3KCkpKQorUmVmPFNvY2tldFN0cmVhbUhhbmRsZT4gU29ja2V0U3RyZWFtSGFuZGxlOjpjcmVh dGUoY29uc3QgVVJMJiB1cmwsIFNvY2tldFN0cmVhbUhhbmRsZUNsaWVudCYgY2xpZW50LCBOZXR3 b3JraW5nQ29udGV4dCYsIFNlc3Npb25JRCkKIHsKLSAgICBMT0coTmV0d29yaywgIlNvY2tldFN0 cmVhbUhhbmRsZSAlcCBuZXcgY2xpZW50ICVwIiwgdGhpcywgJm1fY2xpZW50KTsKLSAgICB1bnNp Z25lZCBwb3J0ID0gdXJsLmhhc1BvcnQoKSA/IHVybC5wb3J0KCkgOiAodXJsLnByb3RvY29sSXMo IndzcyIpID8gNDQzIDogODApOworICAgIFJlZjxTb2NrZXRTdHJlYW1IYW5kbGU+IHNvY2tldCA9 IGFkb3B0UmVmKCpuZXcgU29ja2V0U3RyZWFtSGFuZGxlKHVybCwgY2xpZW50KSk7CiAKKyAgICB1 bnNpZ25lZCBwb3J0ID0gdXJsLmhhc1BvcnQoKSA/IHVybC5wb3J0KCkgOiAodXJsLnByb3RvY29s SXMoIndzcyIpID8gNDQzIDogODApOwogICAgIEdSZWZQdHI8R1NvY2tldENsaWVudD4gc29ja2V0 Q2xpZW50ID0gYWRvcHRHUmVmKGdfc29ja2V0X2NsaWVudF9uZXcoKSk7CiAgICAgaWYgKHVybC5w cm90b2NvbElzKCJ3c3MiKSkKICAgICAgICAgZ19zb2NrZXRfY2xpZW50X3NldF90bHMoc29ja2V0 Q2xpZW50LmdldCgpLCBUUlVFKTsKLSAgICByZWxheEFkb3B0aW9uUmVxdWlyZW1lbnQoKTsKLSAg ICBSZWZQdHI8U29ja2V0U3RyZWFtSGFuZGxlPiBwcm90ZWN0ZWRUaGlzKHRoaXMpOwotICAgIGdf c29ja2V0X2NsaWVudF9jb25uZWN0X3RvX2hvc3RfYXN5bmMoc29ja2V0Q2xpZW50LmdldCgpLCB1 cmwuaG9zdCgpLnV0ZjgoKS5kYXRhKCksIHBvcnQsIG1fY2FuY2VsbGFibGUuZ2V0KCksCi0gICAg ICAgIHJlaW50ZXJwcmV0X2Nhc3Q8R0FzeW5jUmVhZHlDYWxsYmFjaz4oY29ubmVjdGVkQ2FsbGJh Y2spLCBwcm90ZWN0ZWRUaGlzLmxlYWtSZWYoKSk7CisgICAgUmVmPFNvY2tldFN0cmVhbUhhbmRs ZT4gcHJvdGVjdGVkU29ja2V0U3RyZWFtSGFuZGxlID0gc29ja2V0LmNvcHlSZWYoKTsKKyAgICBn X3NvY2tldF9jbGllbnRfY29ubmVjdF90b19ob3N0X2FzeW5jKHNvY2tldENsaWVudC5nZXQoKSwg dXJsLmhvc3QoKS51dGY4KCkuZGF0YSgpLCBwb3J0LCBzb2NrZXQtPm1fY2FuY2VsbGFibGUuZ2V0 KCksCisgICAgICAgIHJlaW50ZXJwcmV0X2Nhc3Q8R0FzeW5jUmVhZHlDYWxsYmFjaz4oY29ubmVj dGVkQ2FsbGJhY2spLCAmcHJvdGVjdGVkU29ja2V0U3RyZWFtSGFuZGxlLmxlYWtSZWYoKSk7Cisg ICAgcmV0dXJuIHNvY2tldDsKIH0KIAotU29ja2V0U3RyZWFtSGFuZGxlOjpTb2NrZXRTdHJlYW1I YW5kbGUoR1NvY2tldENvbm5lY3Rpb24qIHNvY2tldENvbm5lY3Rpb24sIFNvY2tldFN0cmVhbUhh bmRsZUNsaWVudCYgY2xpZW50KQotICAgIDogU29ja2V0U3RyZWFtSGFuZGxlQmFzZShVUkwoKSwg Y2xpZW50KQorUmVmPFNvY2tldFN0cmVhbUhhbmRsZT4gU29ja2V0U3RyZWFtSGFuZGxlOjpjcmVh dGUoR1NvY2tldENvbm5lY3Rpb24qIHNvY2tldENvbm5lY3Rpb24sIFNvY2tldFN0cmVhbUhhbmRs ZUNsaWVudCYgY2xpZW50KQoreworICAgIFJlZjxTb2NrZXRTdHJlYW1IYW5kbGU+IHNvY2tldCA9 IGFkb3B0UmVmKCpuZXcgU29ja2V0U3RyZWFtSGFuZGxlKFVSTCgpLCBjbGllbnQpKTsKKworICAg IEdSZWZQdHI8R1NvY2tldENvbm5lY3Rpb24+IGNvbm5lY3Rpb24gPSBzb2NrZXRDb25uZWN0aW9u OworICAgIHNvY2tldC0+Y29ubmVjdGVkKFdURk1vdmUoY29ubmVjdGlvbikpOworICAgIHJldHVy biBzb2NrZXQ7Cit9CisKK1NvY2tldFN0cmVhbUhhbmRsZTo6U29ja2V0U3RyZWFtSGFuZGxlKGNv bnN0IFVSTCYgdXJsLCBTb2NrZXRTdHJlYW1IYW5kbGVDbGllbnQmIGNsaWVudCkKKyAgICA6IFNv Y2tldFN0cmVhbUhhbmRsZUJhc2UodXJsLCBjbGllbnQpCiAgICAgLCBtX2NhbmNlbGxhYmxlKGFk b3B0R1JlZihnX2NhbmNlbGxhYmxlX25ldygpKSkKIHsKICAgICBMT0coTmV0d29yaywgIlNvY2tl dFN0cmVhbUhhbmRsZSAlcCBuZXcgY2xpZW50ICVwIiwgdGhpcywgJm1fY2xpZW50KTsKLSAgICBH UmVmUHRyPEdTb2NrZXRDb25uZWN0aW9uPiBjb25uZWN0aW9uID0gc29ja2V0Q29ubmVjdGlvbjsK LSAgICByZWxheEFkb3B0aW9uUmVxdWlyZW1lbnQoKTsKLSAgICBjb25uZWN0ZWQoV1RGTW92ZShj b25uZWN0aW9uKSk7CiB9CiAKIFNvY2tldFN0cmVhbUhhbmRsZTo6flNvY2tldFN0cmVhbUhhbmRs ZSgpCg==