79236 2012-02-22 06:40:59 -0800 [GStreamer] webkitwebsrc: use HTTP referer provided by MediaPlayer 2012-02-22 11:12:39 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pnormand pnormand mrobinson oldest_to_newest 561934 0 pnormand 2012-02-22 06:40:59 -0800 MediaPlayer::referrer() was recently added. We should use it. 561944 1 128205 pnormand 2012-02-22 06:55:32 -0800 Created attachment 128205 Patch 561947 2 128207 pnormand 2012-02-22 06:59:05 -0800 Created attachment 128207 Patch 562011 3 128207 mrobinson 2012-02-22 08:50:09 -0800 Comment on attachment 128207 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=128207&action=review Looks fine. What caused you to make this change? Is it tracked by any tests? r- for the minor fixes below. > Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:358 > priv->frame.release(); This should be priv->frame.clear() > Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:427 > + if (priv->player) > + request.setHTTPReferrer(priv->player->referrer()); > + It seems this should be outside of the if block now. I think you can simplify this a bit to be: FrameLoader* loader = priv->frame ? priv->frame->loader() : 0; if (loader) { .... } if (priv->player) request.setHTTPReferrer(priv->player->referrer()); > Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:752 > + Extra newline here 562013 4 mrobinson 2012-02-22 08:51:05 -0800 (In reply to comment #3) > Looks fine. What caused you to make this change? Is it tracked by any tests? r- for the minor fixes below. Oh, I see now that ::refererer() is a recent addition. 562148 5 pnormand 2012-02-22 10:57:49 -0800 (In reply to comment #4) > (In reply to comment #3) > > > Looks fine. What caused you to make this change? Is it tracked by any tests? r- for the minor fixes below. > > Oh, I see now that ::refererer() is a recent addition. Yes, we had code to deal with it already but I believe it makes more sense to use this new method of the player :) 562156 6 128249 pnormand 2012-02-22 11:02:53 -0800 Created attachment 128249 Patch 562157 7 pnormand 2012-02-22 11:04:06 -0800 The test that should still pass is http/tests/media/video-referer.html 562165 8 pnormand 2012-02-22 11:12:39 -0800 Committed r108524: <http://trac.webkit.org/changeset/108524> 128205 2012-02-22 06:55:32 -0800 2012-02-22 06:58:59 -0800 Patch bug-79236-20120222155557.patch text/plain 5163 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4NDc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjliNGE1MDIxOWExMGRl MjMwNzRhMjlkMzJmMmE0MTc3NDJiYjczZC4uMjFhMzgyNmQwNzZhNWFiZDQ4ZDBhNjBmOGFhYmQ1 ZTVkMmE1Y2ZhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAyLTIyICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSB3ZWJraXR3ZWJzcmM6IHVzZSBIVFRQIHJlZmVyZXIgcHJvdmlkZWQgYnkgTWVkaWFQbGF5ZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5MjM2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcmUgYSBw b2ludGVyIHRvIHRoZSBNZWRpYVBsYXllciBvYmplY3QgaW4gdGhlIHByaXZhdGUgc3RydWN0dXJl CisgICAgICAgIG9mIHRoZSBXZWJLaXRXZWJTcmMgZWxlbWVudCBzbyB3ZSBjYW4gY2FsbCBpdHMg cHVibGljIG1ldGhvZHMsCisgICAgICAgIGxpa2UgOjpyZWZlcnJlcigpLgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNvdXJj ZUNoYW5nZWQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRX ZWJTb3VyY2VHU3RyZWFtZXIuY3BwOgorICAgICAgICAoX1dlYktpdFdlYlNyY1ByaXZhdGUpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3Ry ZWFtZXIuaDoKKwogMjAxMi0wMi0yMCAgUm9sYW5kIFN0ZWluZXIgIDxyb2xhbmRzdGVpbmVyQGNo cm9taXVtLm9yZz4KIAogICAgICAgICA8c3R5bGUgc2NvcGVkPjogQWRkIHJ1bnRpbWUtZmxhZwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCAw NWFhYmE4N2E1ZDJjYzA3YmE3NjdiNTYxODdiMjhlYzA0ZTY3ODdhLi5mZDkwZmE5YTZhZmU2M2Y3 YWI1NTQxYmFjZmY0MzEzMmNlYzU1MTQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtMTAzNCwxNSArMTAzNCw4IEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzb3VyY2VDaGFuZ2VkKCkKICAgICBnc3Rfb2JqZWN0X3Jl cGxhY2UocmVpbnRlcnByZXRfY2FzdDxHc3RPYmplY3QqKj4oJm1fc291cmNlKSwKICAgICAgICAg ICAgICAgICAgICAgICAgcmVpbnRlcnByZXRfY2FzdDxHc3RPYmplY3QqPihlbGVtZW50LmdldCgp KSk7CiAKLSAgICBpZiAoV0VCS0lUX0lTX1dFQl9TUkMoZWxlbWVudC5nZXQoKSkpIHsKLSAgICAg ICAgRnJhbWUqIGZyYW1lID0gMDsKLSAgICAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gbV9wbGF5 ZXItPm1lZGlhUGxheWVyQ2xpZW50KCktPm1lZGlhUGxheWVyT3duaW5nRG9jdW1lbnQoKTsKLSAg ICAgICAgaWYgKGRvY3VtZW50KQotICAgICAgICAgICAgZnJhbWUgPSBkb2N1bWVudC0+ZnJhbWUo KTsKLQotICAgICAgICBpZiAoZnJhbWUpCi0gICAgICAgICAgICB3ZWJLaXRXZWJTcmNTZXRGcmFt ZShXRUJLSVRfV0VCX1NSQyhlbGVtZW50LmdldCgpKSwgZnJhbWUpOwotICAgIH0KKyAgICBpZiAo V0VCS0lUX0lTX1dFQl9TUkMoZWxlbWVudC5nZXQoKSkpCisgICAgICAgIHdlYktpdFdlYlNyY1Nl dE1lZGlhUGxheWVyKFdFQktJVF9XRUJfU1JDKGVsZW1lbnQuZ2V0KCkpLCBtX3BsYXllcik7CiB9 CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpjYW5jZWxMb2FkKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRX ZWJTb3VyY2VHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKaW5kZXggYWQ0YzI0ZDgyMjQx OGMzZTM5ZTA1NzdjYzIwMzk4YWYyMzk3MzZjMC4uYmM0ZGQ3YjQ0N2NmMDM5OWY1Yjg2ZWUzZDIz NGNhYTE5Y2JmN2U2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1l ci5jcHAKQEAgLTIyLDkgKzIyLDExIEBACiAjaWYgRU5BQkxFKFZJREVPKSAmJiBVU0UoR1NUUkVB TUVSKQogCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKKyNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1 ZGUgIkdPd25QdHIuaCIKICNpbmNsdWRlICJHUmVmUHRyLmgiCiAjaW5jbHVkZSAiR1JlZlB0ckdT dHJlYW1lci5oIgorI2luY2x1ZGUgIk1lZGlhUGxheWVyLmgiCiAjaW5jbHVkZSAiTmV0d29ya2lu Z0NvbnRleHQuaCIKICNpbmNsdWRlICJOb25jb3B5YWJsZS5oIgogI2luY2x1ZGUgIk5vdEltcGxl bWVudGVkLmgiCkBAIC02Myw2ICs2NSw3IEBAIHN0cnVjdCBfV2ViS2l0V2ViU3JjUHJpdmF0ZSB7 CiAgICAgZ2NoYXIqIHVyaTsKIAogICAgIFJlZlB0cjxXZWJDb3JlOjpGcmFtZT4gZnJhbWU7Cisg ICAgV2ViQ29yZTo6TWVkaWFQbGF5ZXIqIHBsYXllcjsKIAogICAgIFN0cmVhbWluZ0NsaWVudCog Y2xpZW50OwogICAgIFJlZlB0cjxSZXNvdXJjZUhhbmRsZT4gcmVzb3VyY2VIYW5kbGU7CkBAIC00 MTUsMTEgKzQxOCwxMSBAQCBzdGF0aWMgYm9vbCB3ZWJLaXRXZWJTcmNTdGFydChXZWJLaXRXZWJT cmMqIHNyYykKIAogICAgIE5ldHdvcmtpbmdDb250ZXh0KiBjb250ZXh0ID0gMDsKICAgICBpZiAo cHJpdi0+ZnJhbWUpIHsKLSAgICAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gcHJpdi0+ZnJhbWUt PmRvY3VtZW50KCk7Ci0gICAgICAgIGlmIChkb2N1bWVudCkKLSAgICAgICAgICAgIHJlcXVlc3Qu c2V0SFRUUFJlZmVycmVyKGRvY3VtZW50LT5kb2N1bWVudFVSSSgpKTsKLQogICAgICAgICBGcmFt ZUxvYWRlciogbG9hZGVyID0gcHJpdi0+ZnJhbWUtPmxvYWRlcigpOworCisgICAgICAgIGlmIChw cml2LT5wbGF5ZXIpCisgICAgICAgICAgICByZXF1ZXN0LnNldEhUVFBSZWZlcnJlcihwcml2LT5w bGF5ZXItPnJlZmVycmVyKCkpOworCiAgICAgICAgIGlmIChsb2FkZXIpIHsKICAgICAgICAgICAg IGxvYWRlci0+YWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChyZXF1ZXN0KTsKICAg ICAgICAgICAgIGNvbnRleHQgPSBsb2FkZXItPm5ldHdvcmtpbmdDb250ZXh0KCk7CkBAIC03Mzks MTEgKzc0MiwxOCBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2ViS2l0V2ViU3JjU2Vla0RhdGFDYihHc3RB cHBTcmMqIGFwcHNyYywgZ3VpbnQ2NCBvZmZzZXQsIGdwb2ludAogICAgIHJldHVybiBUUlVFOwog fQogCi12b2lkIHdlYktpdFdlYlNyY1NldEZyYW1lKFdlYktpdFdlYlNyYyogc3JjLCBXZWJDb3Jl OjpGcmFtZSogZnJhbWUpCit2b2lkIHdlYktpdFdlYlNyY1NldE1lZGlhUGxheWVyKFdlYktpdFdl YlNyYyogc3JjLCBXZWJDb3JlOjpNZWRpYVBsYXllciogcGxheWVyKQogewogICAgIFdlYktpdFdl YlNyY1ByaXZhdGUqIHByaXYgPSBzcmMtPnByaXY7CisgICAgV2ViQ29yZTo6RnJhbWUqIGZyYW1l ID0gMDsKKworCisgICAgV2ViQ29yZTo6RG9jdW1lbnQqIGRvY3VtZW50ID0gcGxheWVyLT5tZWRp YVBsYXllckNsaWVudCgpLT5tZWRpYVBsYXllck93bmluZ0RvY3VtZW50KCk7CisgICAgaWYgKGRv Y3VtZW50KQorICAgICAgICBmcmFtZSA9IGRvY3VtZW50LT5mcmFtZSgpOwogCiAgICAgcHJpdi0+ ZnJhbWUgPSBmcmFtZTsKKyAgICBwcml2LT5wbGF5ZXIgPSBwbGF5ZXI7CiB9CiAKIFN0cmVhbWlu Z0NsaWVudDo6U3RyZWFtaW5nQ2xpZW50KFdlYktpdFdlYlNyYyogc3JjKSA6IG1fc3JjKHNyYykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9X ZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuaAppbmRleCAyNzEyNDEzYjk1 ZDMwMzczYmQ1MTMwOWJhMzY3MGY1ZGVlMWQyNDQwLi45ZWQ5NWNmYWQzM2IxNGUzZWE2YTIxYWNk YzAyMTQ1ZjY1M2NmM2NhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1l ci5oCkBAIC0yMCw3ICsyMCw3IEBACiAjZGVmaW5lIFdlYktpdFdlYlNvdXJjZUdTdHJlYW1lcl9o CiAjaWYgRU5BQkxFKFZJREVPKSAmJiBVU0UoR1NUUkVBTUVSKQogCi0jaW5jbHVkZSAiRnJhbWUu aCIKKyNpbmNsdWRlICJNZWRpYVBsYXllci5oIgogI2luY2x1ZGUgPGdzdC9nc3QuaD4KIAogR19C RUdJTl9ERUNMUwpAQCAtNDYsNyArNDYsNyBAQCBzdHJ1Y3QgX1dlYktpdFdlYlNyY0NsYXNzIHsK IH07CiAKIEdUeXBlIHdlYmtpdF93ZWJfc3JjX2dldF90eXBlKHZvaWQpOwotdm9pZCAgd2ViS2l0 V2ViU3JjU2V0RnJhbWUoV2ViS2l0V2ViU3JjKiBzcmMsIFdlYkNvcmU6OkZyYW1lKiBmcmFtZSk7 Cit2b2lkIHdlYktpdFdlYlNyY1NldE1lZGlhUGxheWVyKFdlYktpdFdlYlNyYyosIFdlYkNvcmU6 Ok1lZGlhUGxheWVyKik7CiAKIEdfRU5EX0RFQ0xTCiAK 128207 2012-02-22 06:59:05 -0800 2012-02-22 11:02:46 -0800 Patch bug-79236-20120222155931.patch text/plain 5436 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4NDc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjliNGE1MDIxOWExMGRl MjMwNzRhMjlkMzJmMmE0MTc3NDJiYjczZC4uMjFhMzgyNmQwNzZhNWFiZDQ4ZDBhNjBmOGFhYmQ1 ZTVkMmE1Y2ZhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAyLTIyICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSB3ZWJraXR3ZWJzcmM6IHVzZSBIVFRQIHJlZmVyZXIgcHJvdmlkZWQgYnkgTWVkaWFQbGF5ZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5MjM2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcmUgYSBw b2ludGVyIHRvIHRoZSBNZWRpYVBsYXllciBvYmplY3QgaW4gdGhlIHByaXZhdGUgc3RydWN0dXJl CisgICAgICAgIG9mIHRoZSBXZWJLaXRXZWJTcmMgZWxlbWVudCBzbyB3ZSBjYW4gY2FsbCBpdHMg cHVibGljIG1ldGhvZHMsCisgICAgICAgIGxpa2UgOjpyZWZlcnJlcigpLgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNvdXJj ZUNoYW5nZWQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRX ZWJTb3VyY2VHU3RyZWFtZXIuY3BwOgorICAgICAgICAoX1dlYktpdFdlYlNyY1ByaXZhdGUpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3Ry ZWFtZXIuaDoKKwogMjAxMi0wMi0yMCAgUm9sYW5kIFN0ZWluZXIgIDxyb2xhbmRzdGVpbmVyQGNo cm9taXVtLm9yZz4KIAogICAgICAgICA8c3R5bGUgc2NvcGVkPjogQWRkIHJ1bnRpbWUtZmxhZwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCAw NWFhYmE4N2E1ZDJjYzA3YmE3NjdiNTYxODdiMjhlYzA0ZTY3ODdhLi5mZDkwZmE5YTZhZmU2M2Y3 YWI1NTQxYmFjZmY0MzEzMmNlYzU1MTQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtMTAzNCwxNSArMTAzNCw4IEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzb3VyY2VDaGFuZ2VkKCkKICAgICBnc3Rfb2JqZWN0X3Jl cGxhY2UocmVpbnRlcnByZXRfY2FzdDxHc3RPYmplY3QqKj4oJm1fc291cmNlKSwKICAgICAgICAg ICAgICAgICAgICAgICAgcmVpbnRlcnByZXRfY2FzdDxHc3RPYmplY3QqPihlbGVtZW50LmdldCgp KSk7CiAKLSAgICBpZiAoV0VCS0lUX0lTX1dFQl9TUkMoZWxlbWVudC5nZXQoKSkpIHsKLSAgICAg ICAgRnJhbWUqIGZyYW1lID0gMDsKLSAgICAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gbV9wbGF5 ZXItPm1lZGlhUGxheWVyQ2xpZW50KCktPm1lZGlhUGxheWVyT3duaW5nRG9jdW1lbnQoKTsKLSAg ICAgICAgaWYgKGRvY3VtZW50KQotICAgICAgICAgICAgZnJhbWUgPSBkb2N1bWVudC0+ZnJhbWUo KTsKLQotICAgICAgICBpZiAoZnJhbWUpCi0gICAgICAgICAgICB3ZWJLaXRXZWJTcmNTZXRGcmFt ZShXRUJLSVRfV0VCX1NSQyhlbGVtZW50LmdldCgpKSwgZnJhbWUpOwotICAgIH0KKyAgICBpZiAo V0VCS0lUX0lTX1dFQl9TUkMoZWxlbWVudC5nZXQoKSkpCisgICAgICAgIHdlYktpdFdlYlNyY1Nl dE1lZGlhUGxheWVyKFdFQktJVF9XRUJfU1JDKGVsZW1lbnQuZ2V0KCkpLCBtX3BsYXllcik7CiB9 CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpjYW5jZWxMb2FkKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRX ZWJTb3VyY2VHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKaW5kZXggYWQ0YzI0ZDgyMjQx OGMzZTM5ZTA1NzdjYzIwMzk4YWYyMzk3MzZjMC4uNzQxOWM3YmE0Zjc4OThkMWFmNTg5Y2EyOTlj MGJlZDc2OTc0NmM4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1l ci5jcHAKQEAgLTIyLDkgKzIyLDExIEBACiAjaWYgRU5BQkxFKFZJREVPKSAmJiBVU0UoR1NUUkVB TUVSKQogCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKKyNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1 ZGUgIkdPd25QdHIuaCIKICNpbmNsdWRlICJHUmVmUHRyLmgiCiAjaW5jbHVkZSAiR1JlZlB0ckdT dHJlYW1lci5oIgorI2luY2x1ZGUgIk1lZGlhUGxheWVyLmgiCiAjaW5jbHVkZSAiTmV0d29ya2lu Z0NvbnRleHQuaCIKICNpbmNsdWRlICJOb25jb3B5YWJsZS5oIgogI2luY2x1ZGUgIk5vdEltcGxl bWVudGVkLmgiCkBAIC02Myw2ICs2NSw3IEBAIHN0cnVjdCBfV2ViS2l0V2ViU3JjUHJpdmF0ZSB7 CiAgICAgZ2NoYXIqIHVyaTsKIAogICAgIFJlZlB0cjxXZWJDb3JlOjpGcmFtZT4gZnJhbWU7Cisg ICAgV2ViQ29yZTo6TWVkaWFQbGF5ZXIqIHBsYXllcjsKIAogICAgIFN0cmVhbWluZ0NsaWVudCog Y2xpZW50OwogICAgIFJlZlB0cjxSZXNvdXJjZUhhbmRsZT4gcmVzb3VyY2VIYW5kbGU7CkBAIC0z NTQsNiArMzU3LDggQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjU3RvcChXZWJLaXRXZWJTcmMq IHNyYywgYm9vbCBzZWVraW5nKQogICAgIGlmIChwcml2LT5mcmFtZSAmJiAhc2Vla2luZykKICAg ICAgICAgcHJpdi0+ZnJhbWUucmVsZWFzZSgpOwogCisgICAgcHJpdi0+cGxheWVyID0gMDsKKwog ICAgIEdTVF9PQkpFQ1RfTE9DSyhzcmMpOwogICAgIGlmIChwcml2LT5uZWVkRGF0YUlEKQogICAg ICAgICBnX3NvdXJjZV9yZW1vdmUocHJpdi0+bmVlZERhdGFJRCk7CkBAIC00MTUsMTEgKzQyMCwx MSBAQCBzdGF0aWMgYm9vbCB3ZWJLaXRXZWJTcmNTdGFydChXZWJLaXRXZWJTcmMqIHNyYykKIAog ICAgIE5ldHdvcmtpbmdDb250ZXh0KiBjb250ZXh0ID0gMDsKICAgICBpZiAocHJpdi0+ZnJhbWUp IHsKLSAgICAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gcHJpdi0+ZnJhbWUtPmRvY3VtZW50KCk7 Ci0gICAgICAgIGlmIChkb2N1bWVudCkKLSAgICAgICAgICAgIHJlcXVlc3Quc2V0SFRUUFJlZmVy cmVyKGRvY3VtZW50LT5kb2N1bWVudFVSSSgpKTsKLQogICAgICAgICBGcmFtZUxvYWRlciogbG9h ZGVyID0gcHJpdi0+ZnJhbWUtPmxvYWRlcigpOworCisgICAgICAgIGlmIChwcml2LT5wbGF5ZXIp CisgICAgICAgICAgICByZXF1ZXN0LnNldEhUVFBSZWZlcnJlcihwcml2LT5wbGF5ZXItPnJlZmVy cmVyKCkpOworCiAgICAgICAgIGlmIChsb2FkZXIpIHsKICAgICAgICAgICAgIGxvYWRlci0+YWRk RXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChyZXF1ZXN0KTsKICAgICAgICAgICAgIGNv bnRleHQgPSBsb2FkZXItPm5ldHdvcmtpbmdDb250ZXh0KCk7CkBAIC03MzksMTEgKzc0NCwxOCBA QCBzdGF0aWMgZ2Jvb2xlYW4gd2ViS2l0V2ViU3JjU2Vla0RhdGFDYihHc3RBcHBTcmMqIGFwcHNy YywgZ3VpbnQ2NCBvZmZzZXQsIGdwb2ludAogICAgIHJldHVybiBUUlVFOwogfQogCi12b2lkIHdl YktpdFdlYlNyY1NldEZyYW1lKFdlYktpdFdlYlNyYyogc3JjLCBXZWJDb3JlOjpGcmFtZSogZnJh bWUpCit2b2lkIHdlYktpdFdlYlNyY1NldE1lZGlhUGxheWVyKFdlYktpdFdlYlNyYyogc3JjLCBX ZWJDb3JlOjpNZWRpYVBsYXllciogcGxheWVyKQogewogICAgIFdlYktpdFdlYlNyY1ByaXZhdGUq IHByaXYgPSBzcmMtPnByaXY7CisgICAgV2ViQ29yZTo6RnJhbWUqIGZyYW1lID0gMDsKKworCisg ICAgV2ViQ29yZTo6RG9jdW1lbnQqIGRvY3VtZW50ID0gcGxheWVyLT5tZWRpYVBsYXllckNsaWVu dCgpLT5tZWRpYVBsYXllck93bmluZ0RvY3VtZW50KCk7CisgICAgaWYgKGRvY3VtZW50KQorICAg ICAgICBmcmFtZSA9IGRvY3VtZW50LT5mcmFtZSgpOwogCiAgICAgcHJpdi0+ZnJhbWUgPSBmcmFt ZTsKKyAgICBwcml2LT5wbGF5ZXIgPSBwbGF5ZXI7CiB9CiAKIFN0cmVhbWluZ0NsaWVudDo6U3Ry ZWFtaW5nQ2xpZW50KFdlYktpdFdlYlNyYyogc3JjKSA6IG1fc3JjKHNyYykKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3Vy Y2VHU3RyZWFtZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuaAppbmRleCAyNzEyNDEzYjk1ZDMwMzczYmQ1MTMw OWJhMzY3MGY1ZGVlMWQyNDQwLi45ZWQ5NWNmYWQzM2IxNGUzZWE2YTIxYWNkYzAyMTQ1ZjY1M2Nm M2NhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5oCkBAIC0yMCw3 ICsyMCw3IEBACiAjZGVmaW5lIFdlYktpdFdlYlNvdXJjZUdTdHJlYW1lcl9oCiAjaWYgRU5BQkxF KFZJREVPKSAmJiBVU0UoR1NUUkVBTUVSKQogCi0jaW5jbHVkZSAiRnJhbWUuaCIKKyNpbmNsdWRl ICJNZWRpYVBsYXllci5oIgogI2luY2x1ZGUgPGdzdC9nc3QuaD4KIAogR19CRUdJTl9ERUNMUwpA QCAtNDYsNyArNDYsNyBAQCBzdHJ1Y3QgX1dlYktpdFdlYlNyY0NsYXNzIHsKIH07CiAKIEdUeXBl IHdlYmtpdF93ZWJfc3JjX2dldF90eXBlKHZvaWQpOwotdm9pZCAgd2ViS2l0V2ViU3JjU2V0RnJh bWUoV2ViS2l0V2ViU3JjKiBzcmMsIFdlYkNvcmU6OkZyYW1lKiBmcmFtZSk7Cit2b2lkIHdlYktp dFdlYlNyY1NldE1lZGlhUGxheWVyKFdlYktpdFdlYlNyYyosIFdlYkNvcmU6Ok1lZGlhUGxheWVy Kik7CiAKIEdfRU5EX0RFQ0xTCiAK 128249 2012-02-22 11:02:53 -0800 2012-02-22 11:09:31 -0800 Patch bug-79236-20120222200251.patch text/plain 5941 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4NTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWY0M2VkOWE0ZjI4YmQz YjUzZjU1MzNjNjBjZDNlMzViODcwMTUxOS4uMjJlOGVjYWUyNmE2MWFhOWE1MjZlMTBmOTgzMzJm MzdlZTY1ODUzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAyLTIyICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSB3ZWJraXR3ZWJzcmM6IHVzZSBIVFRQIHJlZmVyZXIgcHJvdmlkZWQgYnkgTWVkaWFQbGF5ZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5MjM2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcmUgYSBw b2ludGVyIHRvIHRoZSBNZWRpYVBsYXllciBvYmplY3QgaW4gdGhlIHByaXZhdGUgc3RydWN0dXJl CisgICAgICAgIG9mIHRoZSBXZWJLaXRXZWJTcmMgZWxlbWVudCBzbyB3ZSBjYW4gY2FsbCBpdHMg cHVibGljIG1ldGhvZHMsCisgICAgICAgIGxpa2UgOjpyZWZlcnJlcigpLgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNvdXJj ZUNoYW5nZWQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRX ZWJTb3VyY2VHU3RyZWFtZXIuY3BwOgorICAgICAgICAoX1dlYktpdFdlYlNyY1ByaXZhdGUpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3Ry ZWFtZXIuaDoKKwogMjAxMi0wMi0yMiAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxp YS5jb20+CiAKICAgICAgICAgW0dUS10gQ2xlYW4gYnVpbGQgaXMgYnJva2VuIHdoZW4gdXNpbmcg bWFrZSAtagpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNw cAppbmRleCAwNWFhYmE4N2E1ZDJjYzA3YmE3NjdiNTYxODdiMjhlYzA0ZTY3ODdhLi5mZDkwZmE5 YTZhZmU2M2Y3YWI1NTQxYmFjZmY0MzEzMmNlYzU1MTQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtMTAzNCwxNSArMTAzNCw4IEBAIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzb3VyY2VDaGFuZ2VkKCkKICAgICBnc3Rf b2JqZWN0X3JlcGxhY2UocmVpbnRlcnByZXRfY2FzdDxHc3RPYmplY3QqKj4oJm1fc291cmNlKSwK ICAgICAgICAgICAgICAgICAgICAgICAgcmVpbnRlcnByZXRfY2FzdDxHc3RPYmplY3QqPihlbGVt ZW50LmdldCgpKSk7CiAKLSAgICBpZiAoV0VCS0lUX0lTX1dFQl9TUkMoZWxlbWVudC5nZXQoKSkp IHsKLSAgICAgICAgRnJhbWUqIGZyYW1lID0gMDsKLSAgICAgICAgRG9jdW1lbnQqIGRvY3VtZW50 ID0gbV9wbGF5ZXItPm1lZGlhUGxheWVyQ2xpZW50KCktPm1lZGlhUGxheWVyT3duaW5nRG9jdW1l bnQoKTsKLSAgICAgICAgaWYgKGRvY3VtZW50KQotICAgICAgICAgICAgZnJhbWUgPSBkb2N1bWVu dC0+ZnJhbWUoKTsKLQotICAgICAgICBpZiAoZnJhbWUpCi0gICAgICAgICAgICB3ZWJLaXRXZWJT cmNTZXRGcmFtZShXRUJLSVRfV0VCX1NSQyhlbGVtZW50LmdldCgpKSwgZnJhbWUpOwotICAgIH0K KyAgICBpZiAoV0VCS0lUX0lTX1dFQl9TUkMoZWxlbWVudC5nZXQoKSkpCisgICAgICAgIHdlYktp dFdlYlNyY1NldE1lZGlhUGxheWVyKFdFQktJVF9XRUJfU1JDKGVsZW1lbnQuZ2V0KCkpLCBtX3Bs YXllcik7CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpjYW5jZWxMb2Fk KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKaW5kZXggYWQ0 YzI0ZDgyMjQxOGMzZTM5ZTA1NzdjYzIwMzk4YWYyMzk3MzZjMC4uMmZjMDA1ODFhMjAyNGE3ZDQ2 ZmRjYWUyZWI3ZGE4NTQ2MWYyMTE0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJj ZUdTdHJlYW1lci5jcHAKQEAgLTIyLDkgKzIyLDExIEBACiAjaWYgRU5BQkxFKFZJREVPKSAmJiBV U0UoR1NUUkVBTUVSKQogCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKKyNpbmNsdWRlICJGcmFtZS5o IgogI2luY2x1ZGUgIkdPd25QdHIuaCIKICNpbmNsdWRlICJHUmVmUHRyLmgiCiAjaW5jbHVkZSAi R1JlZlB0ckdTdHJlYW1lci5oIgorI2luY2x1ZGUgIk1lZGlhUGxheWVyLmgiCiAjaW5jbHVkZSAi TmV0d29ya2luZ0NvbnRleHQuaCIKICNpbmNsdWRlICJOb25jb3B5YWJsZS5oIgogI2luY2x1ZGUg Ik5vdEltcGxlbWVudGVkLmgiCkBAIC02Myw2ICs2NSw3IEBAIHN0cnVjdCBfV2ViS2l0V2ViU3Jj UHJpdmF0ZSB7CiAgICAgZ2NoYXIqIHVyaTsKIAogICAgIFJlZlB0cjxXZWJDb3JlOjpGcmFtZT4g ZnJhbWU7CisgICAgV2ViQ29yZTo6TWVkaWFQbGF5ZXIqIHBsYXllcjsKIAogICAgIFN0cmVhbWlu Z0NsaWVudCogY2xpZW50OwogICAgIFJlZlB0cjxSZXNvdXJjZUhhbmRsZT4gcmVzb3VyY2VIYW5k bGU7CkBAIC0zNTIsNyArMzU1LDkgQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjU3RvcChXZWJL aXRXZWJTcmMqIHNyYywgYm9vbCBzZWVraW5nKQogICAgIHByaXYtPnJlc291cmNlSGFuZGxlID0g MDsKIAogICAgIGlmIChwcml2LT5mcmFtZSAmJiAhc2Vla2luZykKLSAgICAgICAgcHJpdi0+ZnJh bWUucmVsZWFzZSgpOworICAgICAgICBwcml2LT5mcmFtZS5jbGVhcigpOworCisgICAgcHJpdi0+ cGxheWVyID0gMDsKIAogICAgIEdTVF9PQkpFQ1RfTE9DSyhzcmMpOwogICAgIGlmIChwcml2LT5u ZWVkRGF0YUlEKQpAQCAtNDE0LDE4ICs0MTksMTUgQEAgc3RhdGljIGJvb2wgd2ViS2l0V2ViU3Jj U3RhcnQoV2ViS2l0V2ViU3JjKiBzcmMpCiAgICAgcmVxdWVzdC5zZXRBbGxvd0Nvb2tpZXModHJ1 ZSk7CiAKICAgICBOZXR3b3JraW5nQ29udGV4dCogY29udGV4dCA9IDA7Ci0gICAgaWYgKHByaXYt PmZyYW1lKSB7Ci0gICAgICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHByaXYtPmZyYW1lLT5kb2N1 bWVudCgpOwotICAgICAgICBpZiAoZG9jdW1lbnQpCi0gICAgICAgICAgICByZXF1ZXN0LnNldEhU VFBSZWZlcnJlcihkb2N1bWVudC0+ZG9jdW1lbnRVUkkoKSk7Ci0KLSAgICAgICAgRnJhbWVMb2Fk ZXIqIGxvYWRlciA9IHByaXYtPmZyYW1lLT5sb2FkZXIoKTsKLSAgICAgICAgaWYgKGxvYWRlcikg ewotICAgICAgICAgICAgbG9hZGVyLT5hZGRFeHRyYUZpZWxkc1RvU3VicmVzb3VyY2VSZXF1ZXN0 KHJlcXVlc3QpOwotICAgICAgICAgICAgY29udGV4dCA9IGxvYWRlci0+bmV0d29ya2luZ0NvbnRl eHQoKTsKLSAgICAgICAgfQorICAgIEZyYW1lTG9hZGVyKiBsb2FkZXIgPSBwcml2LT5mcmFtZSA/ IHByaXYtPmZyYW1lLT5sb2FkZXIoKSA6IDA7CisgICAgaWYgKGxvYWRlcikgeworICAgICAgICBs b2FkZXItPmFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QocmVxdWVzdCk7CisgICAg ICAgIGNvbnRleHQgPSBsb2FkZXItPm5ldHdvcmtpbmdDb250ZXh0KCk7CiAgICAgfQogCisgICAg aWYgKHByaXYtPnBsYXllcikKKyAgICAgICAgcmVxdWVzdC5zZXRIVFRQUmVmZXJyZXIocHJpdi0+ cGxheWVyLT5yZWZlcnJlcigpKTsKKwogICAgIC8vIExldCBBcHBsZSB3ZWIgc2VydmVycyBrbm93 IHdlIHdhbnQgdG8gYWNjZXNzIHRoZWlyIG5pY2UgbW92aWUgdHJhaWxlcnMuCiAgICAgaWYgKCFn X2FzY2lpX3N0cmNhc2VjbXAoIm1vdmllcy5hcHBsZS5jb20iLCB1cmwuaG9zdCgpLnV0ZjgoKS5k YXRhKCkpCiAgICAgICAgIHx8ICFnX2FzY2lpX3N0cmNhc2VjbXAoInRyYWlsZXJzLmFwcGxlLmNv bSIsIHVybC5ob3N0KCkudXRmOCgpLmRhdGEoKSkpCkBAIC03MzksMTEgKzc0MSwxNyBAQCBzdGF0 aWMgZ2Jvb2xlYW4gd2ViS2l0V2ViU3JjU2Vla0RhdGFDYihHc3RBcHBTcmMqIGFwcHNyYywgZ3Vp bnQ2NCBvZmZzZXQsIGdwb2ludAogICAgIHJldHVybiBUUlVFOwogfQogCi12b2lkIHdlYktpdFdl YlNyY1NldEZyYW1lKFdlYktpdFdlYlNyYyogc3JjLCBXZWJDb3JlOjpGcmFtZSogZnJhbWUpCit2 b2lkIHdlYktpdFdlYlNyY1NldE1lZGlhUGxheWVyKFdlYktpdFdlYlNyYyogc3JjLCBXZWJDb3Jl OjpNZWRpYVBsYXllciogcGxheWVyKQogewogICAgIFdlYktpdFdlYlNyY1ByaXZhdGUqIHByaXYg PSBzcmMtPnByaXY7CisgICAgV2ViQ29yZTo6RnJhbWUqIGZyYW1lID0gMDsKKworICAgIFdlYkNv cmU6OkRvY3VtZW50KiBkb2N1bWVudCA9IHBsYXllci0+bWVkaWFQbGF5ZXJDbGllbnQoKS0+bWVk aWFQbGF5ZXJPd25pbmdEb2N1bWVudCgpOworICAgIGlmIChkb2N1bWVudCkKKyAgICAgICAgZnJh bWUgPSBkb2N1bWVudC0+ZnJhbWUoKTsKIAogICAgIHByaXYtPmZyYW1lID0gZnJhbWU7CisgICAg cHJpdi0+cGxheWVyID0gcGxheWVyOwogfQogCiBTdHJlYW1pbmdDbGllbnQ6OlN0cmVhbWluZ0Ns aWVudChXZWJLaXRXZWJTcmMqIHNyYykgOiBtX3NyYyhzcmMpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVh bWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0 V2ViU291cmNlR1N0cmVhbWVyLmgKaW5kZXggMjcxMjQxM2I5NWQzMDM3M2JkNTEzMDliYTM2NzBm NWRlZTFkMjQ0MC4uOWVkOTVjZmFkMzNiMTRlM2VhNmEyMWFjZGMwMjE0NWY2NTNjZjNjYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktp dFdlYlNvdXJjZUdTdHJlYW1lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuaApAQCAtMjAsNyArMjAsNyBA QAogI2RlZmluZSBXZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXJfaAogI2lmIEVOQUJMRShWSURFTykg JiYgVVNFKEdTVFJFQU1FUikKIAotI2luY2x1ZGUgIkZyYW1lLmgiCisjaW5jbHVkZSAiTWVkaWFQ bGF5ZXIuaCIKICNpbmNsdWRlIDxnc3QvZ3N0Lmg+CiAKIEdfQkVHSU5fREVDTFMKQEAgLTQ2LDcg KzQ2LDcgQEAgc3RydWN0IF9XZWJLaXRXZWJTcmNDbGFzcyB7CiB9OwogCiBHVHlwZSB3ZWJraXRf d2ViX3NyY19nZXRfdHlwZSh2b2lkKTsKLXZvaWQgIHdlYktpdFdlYlNyY1NldEZyYW1lKFdlYktp dFdlYlNyYyogc3JjLCBXZWJDb3JlOjpGcmFtZSogZnJhbWUpOwordm9pZCB3ZWJLaXRXZWJTcmNT ZXRNZWRpYVBsYXllcihXZWJLaXRXZWJTcmMqLCBXZWJDb3JlOjpNZWRpYVBsYXllciopOwogCiBH X0VORF9ERUNMUwogCg==