139496 2014-12-10 10:52:36 -0800 [GStreamer] Fix deadlock when shutting down AudioDestination 2014-12-16 00:17:17 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Major --- 1 slomo slomo commit-queue pnormand oldest_to_newest 1054233 0 slomo 2014-12-10 10:52:36 -0800 Patch coming soon 1054236 1 243048 slomo 2014-12-10 10:53:49 -0800 Created attachment 243048 Patch 1054239 2 slomo 2014-12-10 11:01:30 -0800 The GStreamer bug will be fixed in 1.4.5: https://bugzilla.gnome.org/show_bug.cgi?id=740001 1054771 3 243048 pnormand 2014-12-11 23:56:11 -0800 Comment on attachment 243048 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243048&action=review Looks good, thanks! Just a few nits to brag about :) > Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:343 > + // FLUSHING and EOS are no errors are not errors. > Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:378 > + // FLUSHING and EOS are no errors Ditto :) > Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:385 > + } else { > + gst_buffer_unref(channelBuffer); > } for one-line blocks we don't use {} usually. 1054785 4 slomo 2014-12-12 01:10:09 -0800 (In reply to comment #3) > > Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:385 > > + } else { > > + gst_buffer_unref(channelBuffer); > > } > > for one-line blocks we don't use {} usually. Even for cases like if (foo) { multiple lines } else one_line ? I'll change that later when I'm at my laptop again. Thanks for the fast review :) 1054790 5 pnormand 2014-12-12 01:20:38 -0800 Yep but you can double-check with the check-webkit-style script. 1054861 6 243206 slomo 2014-12-12 11:06:41 -0800 Created attachment 243206 Patch 1055574 7 243206 pnormand 2014-12-14 23:28:09 -0800 Comment on attachment 243206 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243206&action=review > Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:429 > + gst_buffer_pool_set_flushing(src->priv->pool, TRUE); Seems like an #ifdef is needed here to make EFL EWS happy... Unless they bump their jhbuild gstreamer version to 1.4.x but that's not up to me to decide :) 1055575 8 slomo 2014-12-15 00:04:50 -0800 (In reply to comment #7) > Comment on attachment 243206 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=243206&action=review > > > Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:429 > > + gst_buffer_pool_set_flushing(src->priv->pool, TRUE); > > Seems like an #ifdef is needed here to make EFL EWS happy... Unless they > bump their jhbuild gstreamer version to 1.4.x but that's not up to me to > decide :) An #ifdef should be fine. That's really just an optimization in the end :) If we're shutting down, gst_buffer_pool_acquire() would return FLUSHING afterwards and we would go out of the srcpad loop earlier... instead of going out of it when trying to push buffers to the appsrcs. 1055663 9 243300 slomo 2014-12-15 10:19:38 -0800 Created attachment 243300 Patch 1055894 10 243300 commit-queue 2014-12-16 00:17:12 -0800 Comment on attachment 243300 Patch Clearing flags on attachment: 243300 Committed r177341: <http://trac.webkit.org/changeset/177341> 1055895 11 commit-queue 2014-12-16 00:17:17 -0800 All reviewed patches have been landed. Closing bug. 243048 2014-12-10 10:53:49 -0800 2014-12-12 11:06:33 -0800 Patch bug-139496-20141210195518.patch text/plain 4621 slomo U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTI3ZmY0MWFmYzczNTMw NWNiZTViYjAwOWU2MzJiYjRlMzk2OTUwMy4uZDZiYmVmYTZmYmM0MmE1YjkxYzE1MmQ0Y2YxOTI2 ODM2ZmI0OGJjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE0LTEyLTEwICBTZWJh c3RpYW4gRHLDtmdlICA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KIAorICAgICAgICBbR1N0 cmVhbWVyXSBGaXggZGVhZGxvY2sgd2hlbiBzaHV0dGluZyBkb3duIEF1ZGlvRGVzdGluYXRpb24K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTQ5Ngor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZv cm0vYXVkaW8vZ3N0cmVhbWVyL1dlYktpdFdlYkF1ZGlvU291cmNlR1N0cmVhbWVyLmNwcDoKKyAg ICAgICAgKHdlYktpdFdlYkF1ZGlvU3JjTG9vcCk6CisgICAgICAgICh3ZWJLaXRXZWJBdWRpb1Ny Y0NoYW5nZVN0YXRlKToKKyAgICAgICAgU29tZXRpbWVzIHdlIHdvdWxkIHdhaXQgZm9yZXZlciBm b3IgdGhlIHRhc2sgdG8gc2h1dCBkb3duLiBUaGlzCisgICAgICAgIHdhcyBoYXBwZW5pbmcgYmVj YXVzZSBvZiBhIGJ1ZyBpbiBHU3RyZWFtZXIgdGhhdCBjYXVzZWQgam9pbmluZworICAgICAgICBh IHBhdXNlZCB0YXNrIHRvIGRlYWRsb2NrLgorCisyMDE0LTEyLTEwICBTZWJhc3RpYW4gRHLDtmdl ICA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KKwogICAgICAgICBbR1N0cmVhbWVyXSBVc2Ug YXBwc3JjcyBpbnN0ZWFkIG9mIHVuY29ubmVjdGVkIHF1ZXVlcwogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NDkwCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9XZWJLaXRXZWJBdWRpb1NvdXJjZUdT dHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIvV2Vi S2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIuY3BwCmluZGV4IDVjMDhhMTgxN2NjNDk1ZDc2ODYw MmY1ZDJhYThhOWQ4ZWYwZjIyZDguLjYzZTRjNDFhYjhhZmVkNWY4MDY1ODg5Yzg0NmIxYjA2YTli MmZhMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1l ci9XZWJLaXRXZWJBdWRpb1NvdXJjZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vYXVkaW8vZ3N0cmVhbWVyL1dlYktpdFdlYkF1ZGlvU291cmNlR1N0cmVhbWVyLmNw cApAQCAtMzE0LDcgKzMxNCw3IEBAIHN0YXRpYyB2b2lkIHdlYktpdFdlYkF1ZGlvU3JjTG9vcChX ZWJLaXRXZWJBdWRpb1NyYyogc3JjKQogICAgIEFTU0VSVChwcml2LT5wcm92aWRlcik7CiAgICAg aWYgKCFwcml2LT5wcm92aWRlciB8fCAhcHJpdi0+YnVzKSB7CiAgICAgICAgIEdTVF9FTEVNRU5U X0VSUk9SKHNyYywgQ09SRSwgRkFJTEVELCAoIkludGVybmFsIFdlYkF1ZGlvU3JjIGVycm9yIiks ICgiQ2FuJ3Qgc3RhcnQgd2l0aG91dCBwcm92aWRlciBvciBidXMiKSk7Ci0gICAgICAgIGdzdF90 YXNrX3BhdXNlKHNyYy0+cHJpdi0+dGFzay5nZXQoKSk7CisgICAgICAgIGdzdF90YXNrX3N0b3Ao c3JjLT5wcml2LT50YXNrLmdldCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMzM5 LDggKzMzOSwxMSBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJBdWRpb1NyY0xvb3AoV2ViS2l0V2Vi QXVkaW9TcmMqIHNyYykKICAgICAgICAgICAgICAgICBnX2ZyZWUoYnVmZmVyKTsKICAgICAgICAg ICAgICAgICBjaGFubmVsQnVmZmVyTGlzdCA9IGdfc2xpc3RfZGVsZXRlX2xpbmsoY2hhbm5lbEJ1 ZmZlckxpc3QsIGNoYW5uZWxCdWZmZXJMaXN0KTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAg IEdTVF9FTEVNRU5UX0VSUk9SKHNyYywgQ09SRSwgUEFELCAoIkludGVybmFsIFdlYkF1ZGlvU3Jj IGVycm9yIiksICgiRmFpbGVkIHRvIGFsbG9jYXRlIGJ1ZmZlciBmb3IgZmxvdzogJXMiLCBnc3Rf Zmxvd19nZXRfbmFtZShyZXQpKSk7Ci0gICAgICAgICAgICBnc3RfdGFza19wYXVzZShzcmMtPnBy aXYtPnRhc2suZ2V0KCkpOworCisgICAgICAgICAgICAvLyBGTFVTSElORyBhbmQgRU9TIGFyZSBu byBlcnJvcnMKKyAgICAgICAgICAgIGlmIChyZXQgPCBHU1RfRkxPV19FT1MgfHwgcmV0ID09IEdT VF9GTE9XX05PVF9MSU5LRUQpCisgICAgICAgICAgICAgICAgR1NUX0VMRU1FTlRfRVJST1Ioc3Jj LCBDT1JFLCBQQUQsICgiSW50ZXJuYWwgV2ViQXVkaW9TcmMgZXJyb3IiKSwgKCJGYWlsZWQgdG8g YWxsb2NhdGUgYnVmZmVyIGZvciBmbG93OiAlcyIsIGdzdF9mbG93X2dldF9uYW1lKHJldCkpKTsK KyAgICAgICAgICAgIGdzdF90YXNrX3N0b3Aoc3JjLT5wcml2LT50YXNrLmdldCgpKTsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQogCkBAIC0zNTksNiArMzYyLDcgQEAgc3RhdGljIHZv aWQgd2ViS2l0V2ViQXVkaW9TcmNMb29wKFdlYktpdFdlYkF1ZGlvU3JjKiBzcmMpCiAgICAgR1NM aXN0KiBzb3VyY2VzSXQgPSBwcml2LT5zb3VyY2VzOwogICAgIEdTTGlzdCogYnVmZmVyc0l0ID0g Y2hhbm5lbEJ1ZmZlckxpc3Q7CiAKKyAgICBHc3RGbG93UmV0dXJuIHJldCA9IEdTVF9GTE9XX09L OwogICAgIGZvciAoaSA9IDA7IHNvdXJjZXNJdCAmJiBidWZmZXJzSXQ7IHNvdXJjZXNJdCA9IGdf c2xpc3RfbmV4dChzb3VyY2VzSXQpLCBidWZmZXJzSXQgPSBnX3NsaXN0X25leHQoYnVmZmVyc0l0 KSwgKytpKSB7CiAgICAgICAgIEdzdEVsZW1lbnQqIGFwcHNyYyA9IHN0YXRpY19jYXN0PEdzdEVs ZW1lbnQqPihzb3VyY2VzSXQtPmRhdGEpOwogICAgICAgICBBdWRpb1NyY0J1ZmZlciogYnVmZmVy ID0gc3RhdGljX2Nhc3Q8QXVkaW9TcmNCdWZmZXIqPihidWZmZXJzSXQtPmRhdGEpOwpAQCAtMzY4 LDEwICszNzIsMTYgQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViQXVkaW9TcmNMb29wKFdlYktpdFdl YkF1ZGlvU3JjKiBzcmMpCiAgICAgICAgIGdzdF9idWZmZXJfdW5tYXAoY2hhbm5lbEJ1ZmZlciwg JmJ1ZmZlci0+aW5mbyk7CiAgICAgICAgIGdfZnJlZShidWZmZXIpOwogCi0gICAgICAgIEdzdEZs b3dSZXR1cm4gcmV0ID0gZ3N0X2FwcF9zcmNfcHVzaF9idWZmZXIoR1NUX0FQUF9TUkMoYXBwc3Jj KSwgY2hhbm5lbEJ1ZmZlcik7Ci0gICAgICAgIGlmIChyZXQgIT0gR1NUX0ZMT1dfT0spIHsKLSAg ICAgICAgICAgIEdTVF9FTEVNRU5UX0VSUk9SKHNyYywgQ09SRSwgUEFELCAoIkludGVybmFsIFdl YkF1ZGlvU3JjIGVycm9yIiksICgiRmFpbGVkIHRvIHB1c2ggYnVmZmVyIG9uICVzIGZsb3c6ICVz IiwgR1NUX09CSkVDVF9OQU1FKGFwcHNyYyksIGdzdF9mbG93X2dldF9uYW1lKHJldCkpKTsKLSAg ICAgICAgICAgIGdzdF90YXNrX3BhdXNlKHNyYy0+cHJpdi0+dGFzay5nZXQoKSk7CisgICAgICAg IGlmIChyZXQgPT0gR1NUX0ZMT1dfT0spIHsKKyAgICAgICAgICAgIHJldCA9IGdzdF9hcHBfc3Jj X3B1c2hfYnVmZmVyKEdTVF9BUFBfU1JDKGFwcHNyYyksIGNoYW5uZWxCdWZmZXIpOworICAgICAg ICAgICAgaWYgKHJldCAhPSBHU1RfRkxPV19PSykgeworICAgICAgICAgICAgICAgIC8vIEZMVVNI SU5HIGFuZCBFT1MgYXJlIG5vIGVycm9ycworICAgICAgICAgICAgICAgIGlmIChyZXQgPCBHU1Rf RkxPV19FT1MgfHwgcmV0ID09IEdTVF9GTE9XX05PVF9MSU5LRUQpCisgICAgICAgICAgICAgICAg ICAgIEdTVF9FTEVNRU5UX0VSUk9SKHNyYywgQ09SRSwgUEFELCAoIkludGVybmFsIFdlYkF1ZGlv U3JjIGVycm9yIiksICgiRmFpbGVkIHRvIHB1c2ggYnVmZmVyIG9uICVzIGZsb3c6ICVzIiwgR1NU X09CSkVDVF9OQU1FKGFwcHNyYyksIGdzdF9mbG93X2dldF9uYW1lKHJldCkpKTsKKyAgICAgICAg ICAgICAgICBnc3RfdGFza19zdG9wKHNyYy0+cHJpdi0+dGFzay5nZXQoKSk7CisgICAgICAgICAg ICB9CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBnc3RfYnVmZmVyX3VucmVmKGNoYW5u ZWxCdWZmZXIpOwogICAgICAgICB9CiAgICAgfQogCkBAIC00MTcsNiArNDI3LDcgQEAgc3RhdGlj IEdzdFN0YXRlQ2hhbmdlUmV0dXJuIHdlYktpdFdlYkF1ZGlvU3JjQ2hhbmdlU3RhdGUoR3N0RWxl bWVudCogZWxlbWVudCwgR3MKICAgICB9CiAgICAgY2FzZSBHU1RfU1RBVEVfQ0hBTkdFX1BBVVNF RF9UT19SRUFEWToKICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJQQVVTRUQtPlJFQURZ Iik7CisgICAgICAgIGdzdF9idWZmZXJfcG9vbF9zZXRfZmx1c2hpbmcoc3JjLT5wcml2LT5wb29s LCBUUlVFKTsKICAgICAgICAgaWYgKCFnc3RfdGFza19qb2luKHNyYy0+cHJpdi0+dGFzay5nZXQo KSkpCiAgICAgICAgICAgICByZXR1cm5WYWx1ZSA9IEdTVF9TVEFURV9DSEFOR0VfRkFJTFVSRTsK ICAgICAgICAgZ3N0X2J1ZmZlcl9wb29sX3NldF9hY3RpdmUoc3JjLT5wcml2LT5wb29sLCBGQUxT RSk7Cg== 243206 2014-12-12 11:06:41 -0800 2014-12-15 10:19:30 -0800 Patch bug-139496-20141212200815.patch text/plain 4661 slomo U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTI3ZmY0MWFmYzczNTMw NWNiZTViYjAwOWU2MzJiYjRlMzk2OTUwMy4uZDZiYmVmYTZmYmM0MmE1YjkxYzE1MmQ0Y2YxOTI2 ODM2ZmI0OGJjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE0LTEyLTEwICBTZWJh c3RpYW4gRHLDtmdlICA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KIAorICAgICAgICBbR1N0 cmVhbWVyXSBGaXggZGVhZGxvY2sgd2hlbiBzaHV0dGluZyBkb3duIEF1ZGlvRGVzdGluYXRpb24K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTQ5Ngor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZv cm0vYXVkaW8vZ3N0cmVhbWVyL1dlYktpdFdlYkF1ZGlvU291cmNlR1N0cmVhbWVyLmNwcDoKKyAg ICAgICAgKHdlYktpdFdlYkF1ZGlvU3JjTG9vcCk6CisgICAgICAgICh3ZWJLaXRXZWJBdWRpb1Ny Y0NoYW5nZVN0YXRlKToKKyAgICAgICAgU29tZXRpbWVzIHdlIHdvdWxkIHdhaXQgZm9yZXZlciBm b3IgdGhlIHRhc2sgdG8gc2h1dCBkb3duLiBUaGlzCisgICAgICAgIHdhcyBoYXBwZW5pbmcgYmVj YXVzZSBvZiBhIGJ1ZyBpbiBHU3RyZWFtZXIgdGhhdCBjYXVzZWQgam9pbmluZworICAgICAgICBh IHBhdXNlZCB0YXNrIHRvIGRlYWRsb2NrLgorCisyMDE0LTEyLTEwICBTZWJhc3RpYW4gRHLDtmdl ICA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KKwogICAgICAgICBbR1N0cmVhbWVyXSBVc2Ug YXBwc3JjcyBpbnN0ZWFkIG9mIHVuY29ubmVjdGVkIHF1ZXVlcwogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NDkwCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9XZWJLaXRXZWJBdWRpb1NvdXJjZUdT dHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIvV2Vi S2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIuY3BwCmluZGV4IDVjMDhhMTgxN2NjNDk1ZDc2ODYw MmY1ZDJhYThhOWQ4ZWYwZjIyZDguLjg0OGI0MzQyZDVhOWU4Y2Q0Y2E0N2IyZTc0MzBkZmIxNjQ1 Nzc2MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1l ci9XZWJLaXRXZWJBdWRpb1NvdXJjZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vYXVkaW8vZ3N0cmVhbWVyL1dlYktpdFdlYkF1ZGlvU291cmNlR1N0cmVhbWVyLmNw cApAQCAtMzE0LDcgKzMxNCw3IEBAIHN0YXRpYyB2b2lkIHdlYktpdFdlYkF1ZGlvU3JjTG9vcChX ZWJLaXRXZWJBdWRpb1NyYyogc3JjKQogICAgIEFTU0VSVChwcml2LT5wcm92aWRlcik7CiAgICAg aWYgKCFwcml2LT5wcm92aWRlciB8fCAhcHJpdi0+YnVzKSB7CiAgICAgICAgIEdTVF9FTEVNRU5U X0VSUk9SKHNyYywgQ09SRSwgRkFJTEVELCAoIkludGVybmFsIFdlYkF1ZGlvU3JjIGVycm9yIiks ICgiQ2FuJ3Qgc3RhcnQgd2l0aG91dCBwcm92aWRlciBvciBidXMiKSk7Ci0gICAgICAgIGdzdF90 YXNrX3BhdXNlKHNyYy0+cHJpdi0+dGFzay5nZXQoKSk7CisgICAgICAgIGdzdF90YXNrX3N0b3Ao c3JjLT5wcml2LT50YXNrLmdldCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMzM5 LDggKzMzOSwxMSBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJBdWRpb1NyY0xvb3AoV2ViS2l0V2Vi QXVkaW9TcmMqIHNyYykKICAgICAgICAgICAgICAgICBnX2ZyZWUoYnVmZmVyKTsKICAgICAgICAg ICAgICAgICBjaGFubmVsQnVmZmVyTGlzdCA9IGdfc2xpc3RfZGVsZXRlX2xpbmsoY2hhbm5lbEJ1 ZmZlckxpc3QsIGNoYW5uZWxCdWZmZXJMaXN0KTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAg IEdTVF9FTEVNRU5UX0VSUk9SKHNyYywgQ09SRSwgUEFELCAoIkludGVybmFsIFdlYkF1ZGlvU3Jj IGVycm9yIiksICgiRmFpbGVkIHRvIGFsbG9jYXRlIGJ1ZmZlciBmb3IgZmxvdzogJXMiLCBnc3Rf Zmxvd19nZXRfbmFtZShyZXQpKSk7Ci0gICAgICAgICAgICBnc3RfdGFza19wYXVzZShzcmMtPnBy aXYtPnRhc2suZ2V0KCkpOworCisgICAgICAgICAgICAvLyBGTFVTSElORyBhbmQgRU9TIGFyZSBu b3QgZXJyb3JzLgorICAgICAgICAgICAgaWYgKHJldCA8IEdTVF9GTE9XX0VPUyB8fCByZXQgPT0g R1NUX0ZMT1dfTk9UX0xJTktFRCkKKyAgICAgICAgICAgICAgICBHU1RfRUxFTUVOVF9FUlJPUihz cmMsIENPUkUsIFBBRCwgKCJJbnRlcm5hbCBXZWJBdWRpb1NyYyBlcnJvciIpLCAoIkZhaWxlZCB0 byBhbGxvY2F0ZSBidWZmZXIgZm9yIGZsb3c6ICVzIiwgZ3N0X2Zsb3dfZ2V0X25hbWUocmV0KSkp OworICAgICAgICAgICAgZ3N0X3Rhc2tfc3RvcChzcmMtPnByaXYtPnRhc2suZ2V0KCkpOwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAgLTM1OSw2ICszNjIsNyBAQCBzdGF0aWMg dm9pZCB3ZWJLaXRXZWJBdWRpb1NyY0xvb3AoV2ViS2l0V2ViQXVkaW9TcmMqIHNyYykKICAgICBH U0xpc3QqIHNvdXJjZXNJdCA9IHByaXYtPnNvdXJjZXM7CiAgICAgR1NMaXN0KiBidWZmZXJzSXQg PSBjaGFubmVsQnVmZmVyTGlzdDsKIAorICAgIEdzdEZsb3dSZXR1cm4gcmV0ID0gR1NUX0ZMT1df T0s7CiAgICAgZm9yIChpID0gMDsgc291cmNlc0l0ICYmIGJ1ZmZlcnNJdDsgc291cmNlc0l0ID0g Z19zbGlzdF9uZXh0KHNvdXJjZXNJdCksIGJ1ZmZlcnNJdCA9IGdfc2xpc3RfbmV4dChidWZmZXJz SXQpLCArK2kpIHsKICAgICAgICAgR3N0RWxlbWVudCogYXBwc3JjID0gc3RhdGljX2Nhc3Q8R3N0 RWxlbWVudCo+KHNvdXJjZXNJdC0+ZGF0YSk7CiAgICAgICAgIEF1ZGlvU3JjQnVmZmVyKiBidWZm ZXIgPSBzdGF0aWNfY2FzdDxBdWRpb1NyY0J1ZmZlcio+KGJ1ZmZlcnNJdC0+ZGF0YSk7CkBAIC0z NjgsMTEgKzM3MiwxNiBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJBdWRpb1NyY0xvb3AoV2ViS2l0 V2ViQXVkaW9TcmMqIHNyYykKICAgICAgICAgZ3N0X2J1ZmZlcl91bm1hcChjaGFubmVsQnVmZmVy LCAmYnVmZmVyLT5pbmZvKTsKICAgICAgICAgZ19mcmVlKGJ1ZmZlcik7CiAKLSAgICAgICAgR3N0 Rmxvd1JldHVybiByZXQgPSBnc3RfYXBwX3NyY19wdXNoX2J1ZmZlcihHU1RfQVBQX1NSQyhhcHBz cmMpLCBjaGFubmVsQnVmZmVyKTsKLSAgICAgICAgaWYgKHJldCAhPSBHU1RfRkxPV19PSykgewot ICAgICAgICAgICAgR1NUX0VMRU1FTlRfRVJST1Ioc3JjLCBDT1JFLCBQQUQsICgiSW50ZXJuYWwg V2ViQXVkaW9TcmMgZXJyb3IiKSwgKCJGYWlsZWQgdG8gcHVzaCBidWZmZXIgb24gJXMgZmxvdzog JXMiLCBHU1RfT0JKRUNUX05BTUUoYXBwc3JjKSwgZ3N0X2Zsb3dfZ2V0X25hbWUocmV0KSkpOwot ICAgICAgICAgICAgZ3N0X3Rhc2tfcGF1c2Uoc3JjLT5wcml2LT50YXNrLmdldCgpKTsKLSAgICAg ICAgfQorICAgICAgICBpZiAocmV0ID09IEdTVF9GTE9XX09LKSB7CisgICAgICAgICAgICByZXQg PSBnc3RfYXBwX3NyY19wdXNoX2J1ZmZlcihHU1RfQVBQX1NSQyhhcHBzcmMpLCBjaGFubmVsQnVm ZmVyKTsKKyAgICAgICAgICAgIGlmIChyZXQgIT0gR1NUX0ZMT1dfT0spIHsKKyAgICAgICAgICAg ICAgICAvLyBGTFVTSElORyBhbmQgRU9TIGFyZSBub3QgZXJyb3JzLgorICAgICAgICAgICAgICAg IGlmIChyZXQgPCBHU1RfRkxPV19FT1MgfHwgcmV0ID09IEdTVF9GTE9XX05PVF9MSU5LRUQpCisg ICAgICAgICAgICAgICAgICAgIEdTVF9FTEVNRU5UX0VSUk9SKHNyYywgQ09SRSwgUEFELCAoIklu dGVybmFsIFdlYkF1ZGlvU3JjIGVycm9yIiksICgiRmFpbGVkIHRvIHB1c2ggYnVmZmVyIG9uICVz IGZsb3c6ICVzIiwgR1NUX09CSkVDVF9OQU1FKGFwcHNyYyksIGdzdF9mbG93X2dldF9uYW1lKHJl dCkpKTsKKyAgICAgICAgICAgICAgICBnc3RfdGFza19zdG9wKHNyYy0+cHJpdi0+dGFzay5nZXQo KSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgZ3N0X2J1ZmZl cl91bnJlZihjaGFubmVsQnVmZmVyKTsKICAgICB9CiAKICAgICBnX3NsaXN0X2ZyZWUoY2hhbm5l bEJ1ZmZlckxpc3QpOwpAQCAtNDE3LDYgKzQyNiw3IEBAIHN0YXRpYyBHc3RTdGF0ZUNoYW5nZVJl dHVybiB3ZWJLaXRXZWJBdWRpb1NyY0NoYW5nZVN0YXRlKEdzdEVsZW1lbnQqIGVsZW1lbnQsIEdz CiAgICAgfQogICAgIGNhc2UgR1NUX1NUQVRFX0NIQU5HRV9QQVVTRURfVE9fUkVBRFk6CiAgICAg ICAgIEdTVF9ERUJVR19PQkpFQ1Qoc3JjLCAiUEFVU0VELT5SRUFEWSIpOworICAgICAgICBnc3Rf YnVmZmVyX3Bvb2xfc2V0X2ZsdXNoaW5nKHNyYy0+cHJpdi0+cG9vbCwgVFJVRSk7CiAgICAgICAg IGlmICghZ3N0X3Rhc2tfam9pbihzcmMtPnByaXYtPnRhc2suZ2V0KCkpKQogICAgICAgICAgICAg cmV0dXJuVmFsdWUgPSBHU1RfU1RBVEVfQ0hBTkdFX0ZBSUxVUkU7CiAgICAgICAgIGdzdF9idWZm ZXJfcG9vbF9zZXRfYWN0aXZlKHNyYy0+cHJpdi0+cG9vbCwgRkFMU0UpOwo= 243300 2014-12-15 10:19:38 -0800 2014-12-16 00:17:12 -0800 Patch bug-139496-20141215192117.patch text/plain 4701 slomo U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTI3ZmY0MWFmYzczNTMw NWNiZTViYjAwOWU2MzJiYjRlMzk2OTUwMy4uZDZiYmVmYTZmYmM0MmE1YjkxYzE1MmQ0Y2YxOTI2 ODM2ZmI0OGJjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE0LTEyLTEwICBTZWJh c3RpYW4gRHLDtmdlICA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KIAorICAgICAgICBbR1N0 cmVhbWVyXSBGaXggZGVhZGxvY2sgd2hlbiBzaHV0dGluZyBkb3duIEF1ZGlvRGVzdGluYXRpb24K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTQ5Ngor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZv cm0vYXVkaW8vZ3N0cmVhbWVyL1dlYktpdFdlYkF1ZGlvU291cmNlR1N0cmVhbWVyLmNwcDoKKyAg ICAgICAgKHdlYktpdFdlYkF1ZGlvU3JjTG9vcCk6CisgICAgICAgICh3ZWJLaXRXZWJBdWRpb1Ny Y0NoYW5nZVN0YXRlKToKKyAgICAgICAgU29tZXRpbWVzIHdlIHdvdWxkIHdhaXQgZm9yZXZlciBm b3IgdGhlIHRhc2sgdG8gc2h1dCBkb3duLiBUaGlzCisgICAgICAgIHdhcyBoYXBwZW5pbmcgYmVj YXVzZSBvZiBhIGJ1ZyBpbiBHU3RyZWFtZXIgdGhhdCBjYXVzZWQgam9pbmluZworICAgICAgICBh IHBhdXNlZCB0YXNrIHRvIGRlYWRsb2NrLgorCisyMDE0LTEyLTEwICBTZWJhc3RpYW4gRHLDtmdl ICA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KKwogICAgICAgICBbR1N0cmVhbWVyXSBVc2Ug YXBwc3JjcyBpbnN0ZWFkIG9mIHVuY29ubmVjdGVkIHF1ZXVlcwogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NDkwCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9XZWJLaXRXZWJBdWRpb1NvdXJjZUdT dHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIvV2Vi S2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIuY3BwCmluZGV4IDVjMDhhMTgxN2NjNDk1ZDc2ODYw MmY1ZDJhYThhOWQ4ZWYwZjIyZDguLjhlZDFlYjYxNjI5ODYzNWQzNWI0ODIyY2ZjYTI0OWQxOWU1 YzZlODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1l ci9XZWJLaXRXZWJBdWRpb1NvdXJjZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vYXVkaW8vZ3N0cmVhbWVyL1dlYktpdFdlYkF1ZGlvU291cmNlR1N0cmVhbWVyLmNw cApAQCAtMzE0LDcgKzMxNCw3IEBAIHN0YXRpYyB2b2lkIHdlYktpdFdlYkF1ZGlvU3JjTG9vcChX ZWJLaXRXZWJBdWRpb1NyYyogc3JjKQogICAgIEFTU0VSVChwcml2LT5wcm92aWRlcik7CiAgICAg aWYgKCFwcml2LT5wcm92aWRlciB8fCAhcHJpdi0+YnVzKSB7CiAgICAgICAgIEdTVF9FTEVNRU5U X0VSUk9SKHNyYywgQ09SRSwgRkFJTEVELCAoIkludGVybmFsIFdlYkF1ZGlvU3JjIGVycm9yIiks ICgiQ2FuJ3Qgc3RhcnQgd2l0aG91dCBwcm92aWRlciBvciBidXMiKSk7Ci0gICAgICAgIGdzdF90 YXNrX3BhdXNlKHNyYy0+cHJpdi0+dGFzay5nZXQoKSk7CisgICAgICAgIGdzdF90YXNrX3N0b3Ao c3JjLT5wcml2LT50YXNrLmdldCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMzM5 LDggKzMzOSwxMSBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJBdWRpb1NyY0xvb3AoV2ViS2l0V2Vi QXVkaW9TcmMqIHNyYykKICAgICAgICAgICAgICAgICBnX2ZyZWUoYnVmZmVyKTsKICAgICAgICAg ICAgICAgICBjaGFubmVsQnVmZmVyTGlzdCA9IGdfc2xpc3RfZGVsZXRlX2xpbmsoY2hhbm5lbEJ1 ZmZlckxpc3QsIGNoYW5uZWxCdWZmZXJMaXN0KTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAg IEdTVF9FTEVNRU5UX0VSUk9SKHNyYywgQ09SRSwgUEFELCAoIkludGVybmFsIFdlYkF1ZGlvU3Jj IGVycm9yIiksICgiRmFpbGVkIHRvIGFsbG9jYXRlIGJ1ZmZlciBmb3IgZmxvdzogJXMiLCBnc3Rf Zmxvd19nZXRfbmFtZShyZXQpKSk7Ci0gICAgICAgICAgICBnc3RfdGFza19wYXVzZShzcmMtPnBy aXYtPnRhc2suZ2V0KCkpOworCisgICAgICAgICAgICAvLyBGTFVTSElORyBhbmQgRU9TIGFyZSBu b3QgZXJyb3JzLgorICAgICAgICAgICAgaWYgKHJldCA8IEdTVF9GTE9XX0VPUyB8fCByZXQgPT0g R1NUX0ZMT1dfTk9UX0xJTktFRCkKKyAgICAgICAgICAgICAgICBHU1RfRUxFTUVOVF9FUlJPUihz cmMsIENPUkUsIFBBRCwgKCJJbnRlcm5hbCBXZWJBdWRpb1NyYyBlcnJvciIpLCAoIkZhaWxlZCB0 byBhbGxvY2F0ZSBidWZmZXIgZm9yIGZsb3c6ICVzIiwgZ3N0X2Zsb3dfZ2V0X25hbWUocmV0KSkp OworICAgICAgICAgICAgZ3N0X3Rhc2tfc3RvcChzcmMtPnByaXYtPnRhc2suZ2V0KCkpOwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAgLTM1OSw2ICszNjIsNyBAQCBzdGF0aWMg dm9pZCB3ZWJLaXRXZWJBdWRpb1NyY0xvb3AoV2ViS2l0V2ViQXVkaW9TcmMqIHNyYykKICAgICBH U0xpc3QqIHNvdXJjZXNJdCA9IHByaXYtPnNvdXJjZXM7CiAgICAgR1NMaXN0KiBidWZmZXJzSXQg PSBjaGFubmVsQnVmZmVyTGlzdDsKIAorICAgIEdzdEZsb3dSZXR1cm4gcmV0ID0gR1NUX0ZMT1df T0s7CiAgICAgZm9yIChpID0gMDsgc291cmNlc0l0ICYmIGJ1ZmZlcnNJdDsgc291cmNlc0l0ID0g Z19zbGlzdF9uZXh0KHNvdXJjZXNJdCksIGJ1ZmZlcnNJdCA9IGdfc2xpc3RfbmV4dChidWZmZXJz SXQpLCArK2kpIHsKICAgICAgICAgR3N0RWxlbWVudCogYXBwc3JjID0gc3RhdGljX2Nhc3Q8R3N0 RWxlbWVudCo+KHNvdXJjZXNJdC0+ZGF0YSk7CiAgICAgICAgIEF1ZGlvU3JjQnVmZmVyKiBidWZm ZXIgPSBzdGF0aWNfY2FzdDxBdWRpb1NyY0J1ZmZlcio+KGJ1ZmZlcnNJdC0+ZGF0YSk7CkBAIC0z NjgsMTEgKzM3MiwxNiBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJBdWRpb1NyY0xvb3AoV2ViS2l0 V2ViQXVkaW9TcmMqIHNyYykKICAgICAgICAgZ3N0X2J1ZmZlcl91bm1hcChjaGFubmVsQnVmZmVy LCAmYnVmZmVyLT5pbmZvKTsKICAgICAgICAgZ19mcmVlKGJ1ZmZlcik7CiAKLSAgICAgICAgR3N0 Rmxvd1JldHVybiByZXQgPSBnc3RfYXBwX3NyY19wdXNoX2J1ZmZlcihHU1RfQVBQX1NSQyhhcHBz cmMpLCBjaGFubmVsQnVmZmVyKTsKLSAgICAgICAgaWYgKHJldCAhPSBHU1RfRkxPV19PSykgewot ICAgICAgICAgICAgR1NUX0VMRU1FTlRfRVJST1Ioc3JjLCBDT1JFLCBQQUQsICgiSW50ZXJuYWwg V2ViQXVkaW9TcmMgZXJyb3IiKSwgKCJGYWlsZWQgdG8gcHVzaCBidWZmZXIgb24gJXMgZmxvdzog JXMiLCBHU1RfT0JKRUNUX05BTUUoYXBwc3JjKSwgZ3N0X2Zsb3dfZ2V0X25hbWUocmV0KSkpOwot ICAgICAgICAgICAgZ3N0X3Rhc2tfcGF1c2Uoc3JjLT5wcml2LT50YXNrLmdldCgpKTsKLSAgICAg ICAgfQorICAgICAgICBpZiAocmV0ID09IEdTVF9GTE9XX09LKSB7CisgICAgICAgICAgICByZXQg PSBnc3RfYXBwX3NyY19wdXNoX2J1ZmZlcihHU1RfQVBQX1NSQyhhcHBzcmMpLCBjaGFubmVsQnVm ZmVyKTsKKyAgICAgICAgICAgIGlmIChyZXQgIT0gR1NUX0ZMT1dfT0spIHsKKyAgICAgICAgICAg ICAgICAvLyBGTFVTSElORyBhbmQgRU9TIGFyZSBub3QgZXJyb3JzLgorICAgICAgICAgICAgICAg IGlmIChyZXQgPCBHU1RfRkxPV19FT1MgfHwgcmV0ID09IEdTVF9GTE9XX05PVF9MSU5LRUQpCisg ICAgICAgICAgICAgICAgICAgIEdTVF9FTEVNRU5UX0VSUk9SKHNyYywgQ09SRSwgUEFELCAoIklu dGVybmFsIFdlYkF1ZGlvU3JjIGVycm9yIiksICgiRmFpbGVkIHRvIHB1c2ggYnVmZmVyIG9uICVz IGZsb3c6ICVzIiwgR1NUX09CSkVDVF9OQU1FKGFwcHNyYyksIGdzdF9mbG93X2dldF9uYW1lKHJl dCkpKTsKKyAgICAgICAgICAgICAgICBnc3RfdGFza19zdG9wKHNyYy0+cHJpdi0+dGFzay5nZXQo KSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgZ3N0X2J1ZmZl cl91bnJlZihjaGFubmVsQnVmZmVyKTsKICAgICB9CiAKICAgICBnX3NsaXN0X2ZyZWUoY2hhbm5l bEJ1ZmZlckxpc3QpOwpAQCAtNDE3LDYgKzQyNiw5IEBAIHN0YXRpYyBHc3RTdGF0ZUNoYW5nZVJl dHVybiB3ZWJLaXRXZWJBdWRpb1NyY0NoYW5nZVN0YXRlKEdzdEVsZW1lbnQqIGVsZW1lbnQsIEdz CiAgICAgfQogICAgIGNhc2UgR1NUX1NUQVRFX0NIQU5HRV9QQVVTRURfVE9fUkVBRFk6CiAgICAg ICAgIEdTVF9ERUJVR19PQkpFQ1Qoc3JjLCAiUEFVU0VELT5SRUFEWSIpOworI2lmIEdTVF9DSEVD S19WRVJTSU9OKDEsIDQsIDApCisgICAgICAgIGdzdF9idWZmZXJfcG9vbF9zZXRfZmx1c2hpbmco c3JjLT5wcml2LT5wb29sLCBUUlVFKTsKKyNlbmRpZgogICAgICAgICBpZiAoIWdzdF90YXNrX2pv aW4oc3JjLT5wcml2LT50YXNrLmdldCgpKSkKICAgICAgICAgICAgIHJldHVyblZhbHVlID0gR1NU X1NUQVRFX0NIQU5HRV9GQUlMVVJFOwogICAgICAgICBnc3RfYnVmZmVyX3Bvb2xfc2V0X2FjdGl2 ZShzcmMtPnByaXYtPnBvb2wsIEZBTFNFKTsK