70679 2011-10-22 06:16:13 -0700 [GTK] Build fixes for glib 2.31 (current master) 2011-10-28 09:48:17 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pnormand webkit-unassigned levin+threading pnormand webkit.review.bot oldest_to_newest 488927 0 pnormand 2011-10-22 06:16:13 -0700 g_cond_new and g_mutex_new are replaced by _init functions. Same for _free, replaced by _clear. 488928 1 112088 pnormand 2011-10-22 06:18:24 -0700 Created attachment 112088 proposed patch 488937 2 112088 mrobinson 2011-10-22 08:30:47 -0700 Comment on attachment 112088 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=112088&action=review > Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp:115 > +#if GLIB_CHECK_VERSION(2, 31, 0) > + g_cond_init(priv->data_cond); > + g_mutex_init(priv->buffer_mutex); > +#else > priv->data_cond = g_cond_new(); > priv->buffer_mutex = g_mutex_new(); > +#endif > } This seems wrong. You are passing uninitialized pointers to g_cond_init. It seems like you'll need to allocate a GCond structure first. Please use the WTF allocator too. :) The same pattern should be used for the GMutex stuff. Would it be easier to simply use WTF threading primitives here? > Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp:253 > +#if GLIB_CHECK_VERSION(2, 31, 0) > + g_cond_clear(priv->data_cond); > +#else > g_cond_free(priv->data_cond); And here you would need to free the allocated data. 492496 3 112878 pnormand 2011-10-28 09:39:23 -0700 Created attachment 112878 proposed patch Use WTF allocator and free allocated memory after clearing the mutex and gcond. 492500 4 pnormand 2011-10-28 09:48:17 -0700 Committed r98731: <http://trac.webkit.org/changeset/98731> 112088 2011-10-22 06:18:24 -0700 2011-10-28 09:39:23 -0700 proposed patch proposed-patch.patch text/plain 2506 pnormand RnJvbSA4OTk0ZGEyNDJiYWIyMGM3ZTZhOTgwYzQ5YWI2MjQzNzlhMzlhMGVjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBTYXQsIDIyIE9jdCAyMDExIDE1OjE4OjAzICswMjAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDE0ICsrKysrKysrKysrKysrCiAuLi4vZ3JhcGhpY3MvZ3N0cmVh bWVyL1ZpZGVvU2lua0dTdHJlYW1lci5jcHAgICAgICB8ICAgMTMgKysrKysrKysrKysrKwogMiBm aWxlcyBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCAwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCA3MWM5YzhlLi44ZjY1OWEzIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEt MTAtMjIgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgorCisgICAgICAg IFtHVEtdIEJ1aWxkIGZpeGVzIGZvciBnbGliIDIuMzEgKGN1cnJlbnQgbWFzdGVyKQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA2NzkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBnX2NvbmRfbmV3IGFuZCBn X211dGV4X25ldyBoYXZlIGJlZW4gcmVwbGFjZWQgYnkgX2luaXQKKyAgICAgICAgZnVuY3Rpb25z LiBTYW1lIGZvciBfZnJlZSwgcmVwbGFjZWQgYnkgX2NsZWFyLgorCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1ZpZGVvU2lua0dTdHJlYW1lci5jcHA6CisgICAgICAgICh3 ZWJraXRfdmlkZW9fc2lua19pbml0KToKKyAgICAgICAgKHdlYmtpdF92aWRlb19zaW5rX2Rpc3Bv c2UpOgorCiAyMDExLTEwLTIyICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSRUdSRVNTSU9OKHI5MjQ4MCk6IFBhc3NpbmcgdW5pbml0aWFsaXplZCB2YXJpYWJs ZSBpbiBIVE1MRWxlbWVudDo6Y2FsY3VsYXRlQW5kQWRqdXN0RGlyZWN0aW9uYWxpdHkoKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1ZpZGVv U2lua0dTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvVmlkZW9TaW5rR1N0cmVhbWVyLmNwcAppbmRleCBiNGIxNDAxLi43MWU4MDRkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvVmlkZW9T aW5rR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvVmlkZW9TaW5rR1N0cmVhbWVyLmNwcApAQCAtMTA1LDggKzEwNSwxMyBAQCB3ZWJr aXRfdmlkZW9fc2lua19pbml0KFdlYktpdFZpZGVvU2luayogc2luaywgV2ViS2l0VmlkZW9TaW5r Q2xhc3MqIGtsYXNzKQogICAgIFdlYktpdFZpZGVvU2lua1ByaXZhdGUqIHByaXY7CiAKICAgICBz aW5rLT5wcml2ID0gcHJpdiA9IEdfVFlQRV9JTlNUQU5DRV9HRVRfUFJJVkFURShzaW5rLCBXRUJL SVRfVFlQRV9WSURFT19TSU5LLCBXZWJLaXRWaWRlb1NpbmtQcml2YXRlKTsKKyNpZiBHTElCX0NI RUNLX1ZFUlNJT04oMiwgMzEsIDApCisgICAgZ19jb25kX2luaXQocHJpdi0+ZGF0YV9jb25kKTsK KyAgICBnX211dGV4X2luaXQocHJpdi0+YnVmZmVyX211dGV4KTsKKyNlbHNlCiAgICAgcHJpdi0+ ZGF0YV9jb25kID0gZ19jb25kX25ldygpOwogICAgIHByaXYtPmJ1ZmZlcl9tdXRleCA9IGdfbXV0 ZXhfbmV3KCk7CisjZW5kaWYKIH0KIAogc3RhdGljIGdib29sZWFuCkBAIC0yNDIsMTIgKzI0Nywy MCBAQCB3ZWJraXRfdmlkZW9fc2lua19kaXNwb3NlKEdPYmplY3QqIG9iamVjdCkKICAgICBXZWJL aXRWaWRlb1NpbmtQcml2YXRlKiBwcml2ID0gc2luay0+cHJpdjsKIAogICAgIGlmIChwcml2LT5k YXRhX2NvbmQpIHsKKyNpZiBHTElCX0NIRUNLX1ZFUlNJT04oMiwgMzEsIDApCisgICAgICAgIGdf Y29uZF9jbGVhcihwcml2LT5kYXRhX2NvbmQpOworI2Vsc2UKICAgICAgICAgZ19jb25kX2ZyZWUo cHJpdi0+ZGF0YV9jb25kKTsKKyNlbmRpZgogICAgICAgICBwcml2LT5kYXRhX2NvbmQgPSAwOwog ICAgIH0KIAogICAgIGlmIChwcml2LT5idWZmZXJfbXV0ZXgpIHsKKyNpZiBHTElCX0NIRUNLX1ZF UlNJT04oMiwgMzEsIDApCisgICAgICAgIGdfbXV0ZXhfY2xlYXIocHJpdi0+YnVmZmVyX211dGV4 KTsKKyNlbHNlCiAgICAgICAgIGdfbXV0ZXhfZnJlZShwcml2LT5idWZmZXJfbXV0ZXgpOworI2Vu ZGlmCiAgICAgICAgIHByaXYtPmJ1ZmZlcl9tdXRleCA9IDA7CiAgICAgfQogCi0tIAoxLjcuNw== 112878 2011-10-28 09:39:23 -0700 2011-10-28 09:43:10 -0700 proposed patch proposed-patch.patch text/plain 2958 pnormand RnJvbSA2NDAwMjkyNGVlMzkyNDVmYmNmMGQ0NzljYTRhYTQ2ZWNjMmM1NTA3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBTYXQsIDIyIE9jdCAyMDExIDE1OjE4OjAzICswMjAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDE0ICsrKysrKysrKysrKysrCiAuLi4vZ3JhcGhpY3MvZ3N0cmVh bWVyL1ZpZGVvU2lua0dTdHJlYW1lci5jcHAgICAgICB8ICAgMTggKysrKysrKysrKysrKysrKysr CiAyIGZpbGVzIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDAgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IDM0YzQ4NDQuLjJiMWM0MGMgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAor MjAxMS0xMC0yMiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CisKKyAg ICAgICAgW0dUS10gQnVpbGQgZml4ZXMgZm9yIGdsaWIgMi4zMSAoY3VycmVudCBtYXN0ZXIpCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDY3OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGdfY29uZF9uZXcg YW5kIGdfbXV0ZXhfbmV3IGhhdmUgYmVlbiByZXBsYWNlZCBieSBfaW5pdAorICAgICAgICBmdW5j dGlvbnMuIFNhbWUgZm9yIF9mcmVlLCByZXBsYWNlZCBieSBfY2xlYXIuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvVmlkZW9TaW5rR1N0cmVhbWVyLmNwcDoKKyAgICAg ICAgKHdlYmtpdF92aWRlb19zaW5rX2luaXQpOgorICAgICAgICAod2Via2l0X3ZpZGVvX3Npbmtf ZGlzcG9zZSk6CisKIDIwMTEtMTAtMjggIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUu Y29tPgogCiAgICAgICAgIFJlc2V0IGxpbmUgbnVtYmVycyBmb3Igc2NyaXB0cyBnZW5lcmF0ZWQg d2l0aCBkb2N1bWVudC53cml0ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9WaWRlb1NpbmtHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1ZpZGVvU2lua0dTdHJlYW1lci5jcHAKaW5k ZXggYjRiMTQwMS4uNDM2MzAzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL1ZpZGVvU2lua0dTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1ZpZGVvU2lua0dTdHJlYW1lci5jcHAK QEAgLTMzLDYgKzMzLDcgQEAKICNpbmNsdWRlIDxnbGliLmg+CiAjaW5jbHVkZSA8Z3N0L2dzdC5o PgogI2luY2x1ZGUgPGdzdC92aWRlby92aWRlby5oPgorI2luY2x1ZGUgPHd0Zi9GYXN0QWxsb2NC YXNlLmg+CiAKIHN0YXRpYyBHc3RTdGF0aWNQYWRUZW1wbGF0ZSBzaW5rdGVtcGxhdGUgPSBHU1Rf U1RBVElDX1BBRF9URU1QTEFURSgic2luayIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR1NUX1BBRF9TSU5LLCBHU1Rf UEFEX0FMV0FZUywKQEAgLTEwNSw4ICsxMDYsMTUgQEAgd2Via2l0X3ZpZGVvX3NpbmtfaW5pdChX ZWJLaXRWaWRlb1NpbmsqIHNpbmssIFdlYktpdFZpZGVvU2lua0NsYXNzKiBrbGFzcykKICAgICBX ZWJLaXRWaWRlb1NpbmtQcml2YXRlKiBwcml2OwogCiAgICAgc2luay0+cHJpdiA9IHByaXYgPSBH X1RZUEVfSU5TVEFOQ0VfR0VUX1BSSVZBVEUoc2luaywgV0VCS0lUX1RZUEVfVklERU9fU0lOSywg V2ViS2l0VmlkZW9TaW5rUHJpdmF0ZSk7CisjaWYgR0xJQl9DSEVDS19WRVJTSU9OKDIsIDMxLCAw KQorICAgIHByaXYtPmRhdGFfY29uZCA9IFdURjo6ZmFzdE5ldzxHQ29uZD4oKTsKKyAgICBnX2Nv bmRfaW5pdChwcml2LT5kYXRhX2NvbmQpOworICAgIHByaXYtPmJ1ZmZlcl9tdXRleCA9IFdURjo6 ZmFzdE5ldzxHTXV0ZXg+KCk7CisgICAgZ19tdXRleF9pbml0KHByaXYtPmJ1ZmZlcl9tdXRleCk7 CisjZWxzZQogICAgIHByaXYtPmRhdGFfY29uZCA9IGdfY29uZF9uZXcoKTsKICAgICBwcml2LT5i dWZmZXJfbXV0ZXggPSBnX211dGV4X25ldygpOworI2VuZGlmCiB9CiAKIHN0YXRpYyBnYm9vbGVh bgpAQCAtMjQyLDEyICsyNTAsMjIgQEAgd2Via2l0X3ZpZGVvX3NpbmtfZGlzcG9zZShHT2JqZWN0 KiBvYmplY3QpCiAgICAgV2ViS2l0VmlkZW9TaW5rUHJpdmF0ZSogcHJpdiA9IHNpbmstPnByaXY7 CiAKICAgICBpZiAocHJpdi0+ZGF0YV9jb25kKSB7CisjaWYgR0xJQl9DSEVDS19WRVJTSU9OKDIs IDMxLCAwKQorICAgICAgICBnX2NvbmRfY2xlYXIocHJpdi0+ZGF0YV9jb25kKTsKKyAgICAgICAg V1RGOjpmYXN0RGVsZXRlKHByaXYtPmRhdGFfY29uZCk7CisjZWxzZQogICAgICAgICBnX2NvbmRf ZnJlZShwcml2LT5kYXRhX2NvbmQpOworI2VuZGlmCiAgICAgICAgIHByaXYtPmRhdGFfY29uZCA9 IDA7CiAgICAgfQogCiAgICAgaWYgKHByaXYtPmJ1ZmZlcl9tdXRleCkgeworI2lmIEdMSUJfQ0hF Q0tfVkVSU0lPTigyLCAzMSwgMCkKKyAgICAgICAgZ19tdXRleF9jbGVhcihwcml2LT5idWZmZXJf bXV0ZXgpOworICAgICAgICBXVEY6OmZhc3REZWxldGUocHJpdi0+YnVmZmVyX211dGV4KTsKKyNl bHNlCiAgICAgICAgIGdfbXV0ZXhfZnJlZShwcml2LT5idWZmZXJfbXV0ZXgpOworI2VuZGlmCiAg ICAgICAgIHByaXYtPmJ1ZmZlcl9tdXRleCA9IDA7CiAgICAgfQogCi0tIAoxLjcuNy4x