139490 2014-12-10 09:27:30 -0800 [GStreamer] Use appsrcs instead of unconnected queues in AudioDestination 2014-12-10 11:42:27 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Minor --- 139487 1 slomo slomo commit-queue pnormand oldest_to_newest 1054178 0 slomo 2014-12-10 09:27:30 -0800 Patch coming in a bit 1054181 1 243032 slomo 2014-12-10 09:30:11 -0800 Created attachment 243032 Patch 1054193 2 243034 slomo 2014-12-10 09:47:33 -0800 Created attachment 243034 Patch 1054194 3 243035 slomo 2014-12-10 09:48:06 -0800 Created attachment 243035 Patch 1054219 4 243044 slomo 2014-12-10 10:19:33 -0800 Created attachment 243044 Patch 1054225 5 243044 pnormand 2014-12-10 10:35:23 -0800 Comment on attachment 243044 Patch Nice! 1054238 6 243049 slomo 2014-12-10 10:58:29 -0800 Created attachment 243049 Patch 1054254 7 243049 commit-queue 2014-12-10 11:42:23 -0800 Comment on attachment 243049 Patch Clearing flags on attachment: 243049 Committed r177085: <http://trac.webkit.org/changeset/177085> 1054255 8 commit-queue 2014-12-10 11:42:27 -0800 All reviewed patches have been landed. Closing bug. 243032 2014-12-10 09:30:11 -0800 2014-12-10 09:47:28 -0800 Patch bug-139490-20141210183140.patch text/plain 11343 slomo U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmEwM2VkNWI3OTViMmQx MzMzMDQwYTUzYzhjNTU1MTUzM2FmZTkwNS4uNTI3ZmY0MWFmYzczNTMwNWNiZTViYjAwOWU2MzJi YjRlMzk2OTUwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE0LTEyLTEwICBTZWJh c3RpYW4gRHLDtmdlICA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KIAorICAgICAgICBbR1N0 cmVhbWVyXSBVc2UgYXBwc3JjcyBpbnN0ZWFkIG9mIHVuY29ubmVjdGVkIHF1ZXVlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NDkwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRp by9nc3RyZWFtZXIvV2ViS2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIuY3BwOgorICAgICAgICAo d2Via2l0X3dlYl9hdWRpb19zcmNfaW5pdCk6CisgICAgICAgICh3ZWJLaXRXZWJBdWRpb1NyY0Nv bnN0cnVjdGVkKToKKyAgICAgICAgKHdlYktpdFdlYkF1ZGlvU3JjRmluYWxpemUpOgorICAgICAg ICAod2ViS2l0V2ViQXVkaW9TcmNTZXRQcm9wZXJ0eSk6CisgICAgICAgICh3ZWJLaXRXZWJBdWRp b1NyY0xvb3ApOgorICAgICAgICAod2ViS2l0V2ViQXVkaW9TcmNDaGFuZ2VTdGF0ZSk6CisgICAg ICAgIFByZXZpb3VzbHkgd2UgZGlyZWN0bHkgY2hhaW5lZCBidWZmZXJzIGludG8gdW5jb25uZWN0 ZWQgcXVldWVzLAorICAgICAgICB3aGljaCBjb25mdXNlZCBzb21lIGNvZGUgaW5zaWRlIEdTdHJl YW1lciBhbmQgY2F1c2VkIHNvbWUgaGFybWxlc3MKKyAgICAgICAgd2FybmluZ3MuIE5vdyB3ZSB1 c2UgYXBwc3JjcyBpbnN0ZWFkLCB3aGljaCBhbHNvIGFsbG93cyB1cyB0byByZW1vdmUKKyAgICAg ICAgcXVpdGUgc29tZSBjb2RlLgorCisyMDE0LTEyLTEwICBTZWJhc3RpYW4gRHLDtmdlICA8c2Vi YXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KKwogICAgICAgICBbR1N0cmVhbWVyXSBVc2UgYSBidWZm ZXIgcG9vbCBmb3IgYWxsb2NhdGlvbnMgaW4gdGhlIEF1ZGlvRGVzdGluYXRpb24KICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTQ4NwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIvV2ViS2l0V2ViQXVk aW9Tb3VyY2VHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vZ3N0 cmVhbWVyL1dlYktpdFdlYkF1ZGlvU291cmNlR1N0cmVhbWVyLmNwcAppbmRleCA2NzJkMzQ1ZTVj ZmM5NTM1YTI3NjcwMWYzYjMxYjQ0OGI0MDA5ZDBiLi5iYTI4YzBjMzM0OWIxNjNhZDg0ZmQ3YzY4 MDEzNDFiODI3OTEyMDIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRp by9nc3RyZWFtZXIvV2ViS2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9XZWJLaXRXZWJBdWRpb1NvdXJjZUdT dHJlYW1lci5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJBdWRpb0lPQ2FsbGJhY2su aCIKICNpbmNsdWRlICJHUmVmUHRyR1N0cmVhbWVyLmgiCiAjaW5jbHVkZSAiR1N0cmVhbWVyVXRp bGl0aWVzLmgiCisjaW5jbHVkZSA8Z3N0L2FwcC9hcHAuaD4KICNpbmNsdWRlIDxnc3QvYXVkaW8v YXVkaW8uaD4KICNpbmNsdWRlIDxnc3QvcGJ1dGlscy9wYnV0aWxzLmg+CiAjaW5jbHVkZSA8d3Rm L2dvYmplY3QvR1VuaXF1ZVB0ci5oPgpAQCAtNTIsMTcgKzUzLDE2IEBAIHN0cnVjdCBfV2ViS2l0 V2ViQXVkaW9Tb3VyY2VQcml2YXRlIHsKICAgICBBdWRpb0J1cyogYnVzOwogICAgIEF1ZGlvSU9D YWxsYmFjayogcHJvdmlkZXI7CiAgICAgZ3VpbnQgZnJhbWVzVG9QdWxsOworICAgIGd1aW50IGJ1 ZmZlclNpemU7CiAKICAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IGludGVybGVhdmU7CiAKICAgICBH UmVmUHRyPEdzdFRhc2s+IHRhc2s7CiAgICAgR1JlY011dGV4IG11dGV4OwogCi0gICAgR1NMaXN0 KiBwYWRzOyAvLyBMaXN0IG9mIHF1ZXVlIHNpbmsgcGFkcy4gT25lIHF1ZXVlIGZvciBlYWNoIHBs YW5hciBhdWRpbyBjaGFubmVsLgorICAgIEdTTGlzdCogc291cmNlczsgLy8gTGlzdCBvZiBhcHBz cmMuIE9uZSBhcHBzcmMgZm9yIGVhY2ggcGxhbmFyIGF1ZGlvIGNoYW5uZWwuCiAgICAgR3N0UGFk KiBzb3VyY2VQYWQ7IC8vIHNyYyBwYWQgb2YgdGhlIGVsZW1lbnQsIGludGVybGVhdmVkIHdhdiBk YXRhIGlzIHB1c2hlZCB0byBpdC4KIAotICAgIGJvb2wgbmV3U3RyZWFtRXZlbnRQZW5kaW5nOwot ICAgIEdzdFNlZ21lbnQgc2VnbWVudDsKICAgICBndWludDY0IG51bWJlck9mU2FtcGxlczsKIAog ICAgIEdzdEJ1ZmZlclBvb2wqIHBvb2w7CkBAIC0xOTIsOSArMTkyLDYgQEAgc3RhdGljIHZvaWQg d2Via2l0X3dlYl9hdWRpb19zcmNfaW5pdChXZWJLaXRXZWJBdWRpb1NyYyogc3JjKQogICAgIHBy aXYtPnByb3ZpZGVyID0gMDsKICAgICBwcml2LT5idXMgPSAwOwogCi0gICAgcHJpdi0+bmV3U3Ry ZWFtRXZlbnRQZW5kaW5nID0gdHJ1ZTsKLSAgICBnc3Rfc2VnbWVudF9pbml0KCZwcml2LT5zZWdt ZW50LCBHU1RfRk9STUFUX1RJTUUpOwotCiAgICAgZ19yZWNfbXV0ZXhfaW5pdCgmcHJpdi0+bXV0 ZXgpOwogICAgIHByaXYtPnRhc2sgPSBnc3RfdGFza19uZXcocmVpbnRlcnByZXRfY2FzdDxHc3RU YXNrRnVuY3Rpb24+KHdlYktpdFdlYkF1ZGlvU3JjTG9vcCksIHNyYywgMCk7CiAKQEAgLTIxMCw3 ICsyMDcsNyBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJBdWRpb1NyY0NvbnN0cnVjdGVkKEdPYmpl Y3QqIG9iamVjdCkKICAgICBBU1NFUlQocHJpdi0+cHJvdmlkZXIpOwogICAgIEFTU0VSVChwcml2 LT5zYW1wbGVSYXRlKTsKIAotICAgIHByaXYtPmludGVybGVhdmUgPSBnc3RfZWxlbWVudF9mYWN0 b3J5X21ha2UoImludGVybGVhdmUiLCAwKTsKKyAgICBwcml2LT5pbnRlcmxlYXZlID0gZ3N0X2Vs ZW1lbnRfZmFjdG9yeV9tYWtlKCJpbnRlcmxlYXZlIiwgbnVsbHB0cik7CiAKICAgICBpZiAoIXBy aXYtPmludGVybGVhdmUpIHsKICAgICAgICAgR1NUX0VSUk9SX09CSkVDVChzcmMsICJGYWlsZWQg dG8gY3JlYXRlIGludGVybGVhdmUiKTsKQEAgLTIyMCwzNCArMjE3LDI5IEBAIHN0YXRpYyB2b2lk IHdlYktpdFdlYkF1ZGlvU3JjQ29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQogICAgIGdzdF9i aW5fYWRkKEdTVF9CSU4oc3JjKSwgcHJpdi0+aW50ZXJsZWF2ZS5nZXQoKSk7CiAKICAgICAvLyBG b3IgZWFjaCBjaGFubmVsIG9mIHRoZSBidXMgY3JlYXRlIGEgbmV3IHVwc3RyZWFtIGJyYW5jaCBm b3IgaW50ZXJsZWF2ZSwgbGlrZToKLSAgICAvLyBxdWV1ZSAhIGNhcHNmaWx0ZXIuIHdoaWNoIGlz IHBsdWdnZWQgdG8gYSBuZXcgaW50ZXJsZWF2ZSByZXF1ZXN0IHNpbmtwYWQuCisgICAgLy8gYXBw c3JjICEgLiB3aGljaCBpcyBwbHVnZ2VkIHRvIGEgbmV3IGludGVybGVhdmUgcmVxdWVzdCBzaW5r cGFkLgogICAgIGZvciAodW5zaWduZWQgY2hhbm5lbEluZGV4ID0gMDsgY2hhbm5lbEluZGV4IDwg cHJpdi0+YnVzLT5udW1iZXJPZkNoYW5uZWxzKCk7IGNoYW5uZWxJbmRleCsrKSB7Ci0gICAgICAg IEdVbmlxdWVQdHI8Z2NoYXI+IHF1ZXVlTmFtZShnX3N0cmR1cF9wcmludGYoIndlYmF1ZGlvUXVl dWUldSIsIGNoYW5uZWxJbmRleCkpOwotICAgICAgICBHc3RFbGVtZW50KiBxdWV1ZSA9IGdzdF9l bGVtZW50X2ZhY3RvcnlfbWFrZSgicXVldWUiLCBxdWV1ZU5hbWUuZ2V0KCkpOwotICAgICAgICBH c3RFbGVtZW50KiBjYXBzZmlsdGVyID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJjYXBzZmls dGVyIiwgMCk7Ci0KKyAgICAgICAgR1VuaXF1ZVB0cjxnY2hhcj4gYXBwc3JjTmFtZShnX3N0cmR1 cF9wcmludGYoIndlYmF1ZGlvU3JjJXUiLCBjaGFubmVsSW5kZXgpKTsKKyAgICAgICAgR1JlZlB0 cjxHc3RFbGVtZW50PiBhcHBzcmMgPSBhZG9wdEdSZWYoZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtl KCJhcHBzcmMiLCBhcHBzcmNOYW1lLmdldCgpKSk7CiAgICAgICAgIEdSZWZQdHI8R3N0Q2Fwcz4g bW9ub0NhcHMgPSBhZG9wdEdSZWYoZ2V0R1N0cmVhbWVyTW9ub0F1ZGlvQ2Fwcyhwcml2LT5zYW1w bGVSYXRlKSk7CiAKICAgICAgICAgR3N0QXVkaW9JbmZvIGluZm87CiAgICAgICAgIGdzdF9hdWRp b19pbmZvX2Zyb21fY2FwcygmaW5mbywgbW9ub0NhcHMuZ2V0KCkpOwogICAgICAgICBHU1RfQVVE SU9fSU5GT19QT1NJVElPTigmaW5mbywgMCkgPSB3ZWJLaXRXZWJBdWRpb0dTdHJlYW1lckNoYW5u ZWxQb3NpdGlvbihjaGFubmVsSW5kZXgpOwogICAgICAgICBHUmVmUHRyPEdzdENhcHM+IGNhcHMg PSBhZG9wdEdSZWYoZ3N0X2F1ZGlvX2luZm9fdG9fY2FwcygmaW5mbykpOwotICAgICAgICBnX29i amVjdF9zZXQoY2Fwc2ZpbHRlciwgImNhcHMiLCBjYXBzLmdldCgpLCBOVUxMKTsKIAotICAgICAg ICAvLyBDb25maWd1cmUgdGhlIHF1ZXVlIGZvciBtaW5pbWFsIGxhdGVuY3kuCi0gICAgICAgIGdf b2JqZWN0X3NldChxdWV1ZSwgIm1heC1zaXplLWJ1ZmZlcnMiLCBzdGF0aWNfY2FzdDxndWludD4o MSksIE5VTEwpOworICAgICAgICAvLyBDb25maWd1cmUgdGhlIGFwcHNyYyBmb3IgbWluaW1hbCBs YXRlbmN5LgorICAgICAgICBnX29iamVjdF9zZXQoYXBwc3JjLmdldCgpLCAibWF4LWJ5dGVzIiwg MiAqIHByaXYtPmJ1ZmZlclNpemUsICJibG9jayIsIFRSVUUsCisgICAgICAgICAgICAiZm9ybWF0 IiwgR1NUX0ZPUk1BVF9USU1FLCAiY2FwcyIsIGNhcHMuZ2V0KCksIG51bGxwdHIpOwogCi0gICAg ICAgIEdzdFBhZCogcGFkID0gZ3N0X2VsZW1lbnRfZ2V0X3N0YXRpY19wYWQocXVldWUsICJzaW5r Iik7Ci0gICAgICAgIHByaXYtPnBhZHMgPSBnX3NsaXN0X3ByZXBlbmQocHJpdi0+cGFkcywgcGFk KTsKLQotICAgICAgICBnc3RfYmluX2FkZF9tYW55KEdTVF9CSU4oc3JjKSwgcXVldWUsIGNhcHNm aWx0ZXIsIE5VTEwpOwotICAgICAgICBnc3RfZWxlbWVudF9saW5rX3BhZHNfZnVsbChxdWV1ZSwg InNyYyIsIGNhcHNmaWx0ZXIsICJzaW5rIiwgR1NUX1BBRF9MSU5LX0NIRUNLX05PVEhJTkcpOwot ICAgICAgICBnc3RfZWxlbWVudF9saW5rX3BhZHNfZnVsbChjYXBzZmlsdGVyLCAic3JjIiwgcHJp di0+aW50ZXJsZWF2ZS5nZXQoKSwgInNpbmtfJXUiLCBHU1RfUEFEX0xJTktfQ0hFQ0tfTk9USElO Ryk7CisgICAgICAgIHByaXYtPnNvdXJjZXMgPSBnX3NsaXN0X3ByZXBlbmQocHJpdi0+c291cmNl cywgYXBwc3JjLmxlYWtSZWYoKSk7CiAKKyAgICAgICAgZ3N0X2Jpbl9hZGQoR1NUX0JJTihzcmMp LCBhcHBzcmMubGVha1JlZigpKTsKKyAgICAgICAgZ3N0X2VsZW1lbnRfbGlua19wYWRzX2Z1bGwo YXBwc3JjLmdldCgpLCAic3JjIiwgcHJpdi0+aW50ZXJsZWF2ZS5nZXQoKSwgInNpbmtfJXUiLCBH U1RfUEFEX0xJTktfQ0hFQ0tfTk9USElORyk7CiAgICAgfQotICAgIHByaXYtPnBhZHMgPSBnX3Ns aXN0X3JldmVyc2UocHJpdi0+cGFkcyk7CisgICAgcHJpdi0+c291cmNlcyA9IGdfc2xpc3RfcmV2 ZXJzZShwcml2LT5zb3VyY2VzKTsKIAotICAgIC8vIHdhdmVuYydzIHNyYyBwYWQgaXMgdGhlIG9u bHkgdmlzaWJsZSBwYWQgb2Ygb3VyIGVsZW1lbnQuCisgICAgLy8gaW50ZXJsZWF2ZSdzIHNyYyBw YWQgaXMgdGhlIG9ubHkgdmlzaWJsZSBwYWQgb2Ygb3VyIGVsZW1lbnQuCiAgICAgR1JlZlB0cjxH c3RQYWQ+IHRhcmdldFBhZCA9IGFkb3B0R1JlZihnc3RfZWxlbWVudF9nZXRfc3RhdGljX3BhZChw cml2LT5pbnRlcmxlYXZlLmdldCgpLCAic3JjIikpOwogICAgIGdzdF9naG9zdF9wYWRfc2V0X3Rh cmdldChHU1RfR0hPU1RfUEFEKHByaXYtPnNvdXJjZVBhZCksIHRhcmdldFBhZC5nZXQoKSk7CiB9 CkBAIC0yNTksNyArMjUxLDcgQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViQXVkaW9TcmNGaW5hbGl6 ZShHT2JqZWN0KiBvYmplY3QpCiAKICAgICBnX3JlY19tdXRleF9jbGVhcigmcHJpdi0+bXV0ZXgp OwogCi0gICAgZ19zbGlzdF9mcmVlX2Z1bGwocHJpdi0+cGFkcywgcmVpbnRlcnByZXRfY2FzdDxH RGVzdHJveU5vdGlmeT4oZ3N0X29iamVjdF91bnJlZikpOworICAgIGdfc2xpc3RfZnJlZV9mdWxs KHByaXYtPnNvdXJjZXMsIHJlaW50ZXJwcmV0X2Nhc3Q8R0Rlc3Ryb3lOb3RpZnk+KGdzdF9vYmpl Y3RfdW5yZWYpKTsKIAogICAgIHByaXYtPn5XZWJLaXRXZWJBdWRpb1NvdXJjZVByaXZhdGUoKTsK ICAgICBHU1RfQ0FMTF9QQVJFTlQoR19PQkpFQ1RfQ0xBU1MsIGZpbmFsaXplLCAoKEdPYmplY3Qq ICkoc3JjKSkpOwpAQCAtMjgyLDYgKzI3NCw3IEBAIHN0YXRpYyB2b2lkIHdlYktpdFdlYkF1ZGlv U3JjU2V0UHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBndWludCBwcm9wZXJ0eUlkLCBjb25zCiAg ICAgICAgIGJyZWFrOwogICAgIGNhc2UgUFJPUF9GUkFNRVM6CiAgICAgICAgIHByaXYtPmZyYW1l c1RvUHVsbCA9IGdfdmFsdWVfZ2V0X3VpbnQodmFsdWUpOworICAgICAgICBwcml2LT5idWZmZXJT aXplID0gc2l6ZW9mKGZsb2F0KSAqIHByaXYtPmZyYW1lc1RvUHVsbDsKICAgICAgICAgYnJlYWs7 CiAgICAgZGVmYXVsdDoKICAgICAgICAgR19PQkpFQ1RfV0FSTl9JTlZBTElEX1BST1BFUlRZX0lE KG9iamVjdCwgcHJvcGVydHlJZCwgcHNwZWMpOwpAQCAtMzMwLDcgKzMyMyw3IEBAIHN0YXRpYyB2 b2lkIHdlYktpdFdlYkF1ZGlvU3JjTG9vcChXZWJLaXRXZWJBdWRpb1NyYyogc3JjKQogCiAgICAg R1NMaXN0KiBjaGFubmVsQnVmZmVyTGlzdCA9IDA7CiAgICAgcmVnaXN0ZXIgaW50IGk7Ci0gICAg Zm9yIChpID0gZ19zbGlzdF9sZW5ndGgocHJpdi0+cGFkcykgLSAxOyBpID49IDA7IGktLSkgewor ICAgIGZvciAoaSA9IGdfc2xpc3RfbGVuZ3RoKHByaXYtPnNvdXJjZXMpIC0gMTsgaSA+PSAwOyBp LS0pIHsKICAgICAgICAgQXVkaW9TcmNCdWZmZXIqIGJ1ZmZlciA9IGdfbmV3KEF1ZGlvU3JjQnVm ZmVyLCAxKTsKICAgICAgICAgR3N0QnVmZmVyKiBjaGFubmVsQnVmZmVyOwogCkBAIC0zNjEsMTcg KzM1NCwxMSBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJBdWRpb1NyY0xvb3AoV2ViS2l0V2ViQXVk aW9TcmMqIHNyYykKICAgICAvLyBGSVhNRTogQWRkIHN1cHBvcnQgZm9yIGxvY2FsL2xpdmUgYXVk aW8gaW5wdXQuCiAgICAgcHJpdi0+cHJvdmlkZXItPnJlbmRlcigwLCBwcml2LT5idXMsIHByaXYt PmZyYW1lc1RvUHVsbCk7CiAKLSAgICBHU0xpc3QqIHBhZHNJdCA9IHByaXYtPnBhZHM7CisgICAg R1NMaXN0KiBzb3VyY2VzSXQgPSBwcml2LT5zb3VyY2VzOwogICAgIEdTTGlzdCogYnVmZmVyc0l0 ID0gY2hhbm5lbEJ1ZmZlckxpc3Q7CiAKLSNpZiBHU1RfQ0hFQ0tfVkVSU0lPTigxLCAyLCAwKQot ICAgIGd1aW50IGdyb3VwSWQgPSAwOwotICAgIGlmIChwcml2LT5uZXdTdHJlYW1FdmVudFBlbmRp bmcpCi0gICAgICAgIGdyb3VwSWQgPSBnc3RfdXRpbF9ncm91cF9pZF9uZXh0KCk7Ci0jZW5kaWYK LQotICAgIGZvciAoaSA9IDA7IHBhZHNJdCAmJiBidWZmZXJzSXQ7IHBhZHNJdCA9IGdfc2xpc3Rf bmV4dChwYWRzSXQpLCBidWZmZXJzSXQgPSBnX3NsaXN0X25leHQoYnVmZmVyc0l0KSwgKytpKSB7 Ci0gICAgICAgIEdzdFBhZCogcGFkID0gc3RhdGljX2Nhc3Q8R3N0UGFkKj4ocGFkc0l0LT5kYXRh KTsKKyAgICBmb3IgKGkgPSAwOyBzb3VyY2VzSXQgJiYgYnVmZmVyc0l0OyBzb3VyY2VzSXQgPSBn X3NsaXN0X25leHQoc291cmNlc0l0KSwgYnVmZmVyc0l0ID0gZ19zbGlzdF9uZXh0KGJ1ZmZlcnNJ dCksICsraSkgeworICAgICAgICBHc3RFbGVtZW50KiBhcHBzcmMgPSBzdGF0aWNfY2FzdDxHc3RF bGVtZW50Kj4oc291cmNlc0l0LT5kYXRhKTsKICAgICAgICAgQXVkaW9TcmNCdWZmZXIqIGJ1ZmZl ciA9IHN0YXRpY19jYXN0PEF1ZGlvU3JjQnVmZmVyKj4oYnVmZmVyc0l0LT5kYXRhKTsKICAgICAg ICAgR3N0QnVmZmVyKiBjaGFubmVsQnVmZmVyID0gYnVmZmVyLT5idWZmZXI7CiAKQEAgLTM3OSwz NyArMzY2LDEzIEBAIHN0YXRpYyB2b2lkIHdlYktpdFdlYkF1ZGlvU3JjTG9vcChXZWJLaXRXZWJB dWRpb1NyYyogc3JjKQogICAgICAgICBnc3RfYnVmZmVyX3VubWFwKGNoYW5uZWxCdWZmZXIsICZi dWZmZXItPmluZm8pOwogICAgICAgICBnX2ZyZWUoYnVmZmVyKTsKIAotICAgICAgICAvLyBTZW5k IHN0cmVhbS1zdGFydCwgc2VnbWVudCBhbmQgY2FwcyBldmVudHMgZG93bnN0cmVhbSwgYWxvbmcg d2l0aCB0aGUgZmlyc3QgYnVmZmVyLgotICAgICAgICBpZiAocHJpdi0+bmV3U3RyZWFtRXZlbnRQ ZW5kaW5nKSB7Ci0gICAgICAgICAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IHF1ZXVlID0gYWRvcHRH UmVmKGdzdF9wYWRfZ2V0X3BhcmVudF9lbGVtZW50KHBhZCkpOwotICAgICAgICAgICAgR1JlZlB0 cjxHc3RQYWQ+IHNpbmtQYWQgPSBhZG9wdEdSZWYoZ3N0X2VsZW1lbnRfZ2V0X3N0YXRpY19wYWQo cXVldWUuZ2V0KCksICJzaW5rIikpOwotICAgICAgICAgICAgR1VuaXF1ZVB0cjxnY2hhcj4gcXVl dWVOYW1lKGdzdF9lbGVtZW50X2dldF9uYW1lKHF1ZXVlLmdldCgpKSk7Ci0gICAgICAgICAgICBH VW5pcXVlUHRyPGdjaGFyPiBzdHJlYW1JZChnX3N0cmR1cF9wcmludGYoIndlYmF1ZGlvLyVzIiwg cXVldWVOYW1lLmdldCgpKSk7Ci0gICAgICAgICAgICBHc3RFdmVudCogc3RyZWFtU3RhcnRFdmVu dCA9IGdzdF9ldmVudF9uZXdfc3RyZWFtX3N0YXJ0KHN0cmVhbUlkLmdldCgpKTsKLSNpZiBHU1Rf Q0hFQ0tfVkVSU0lPTigxLCAyLCAwKQotICAgICAgICAgICAgZ3N0X2V2ZW50X3NldF9ncm91cF9p ZChzdHJlYW1TdGFydEV2ZW50LCBncm91cElkKTsKLSNlbmRpZgotICAgICAgICAgICAgZ3N0X3Bh ZF9zZW5kX2V2ZW50KHNpbmtQYWQuZ2V0KCksIHN0cmVhbVN0YXJ0RXZlbnQpOwotCi0gICAgICAg ICAgICBHUmVmUHRyPEdzdENhcHM+IG1vbm9DYXBzID0gYWRvcHRHUmVmKGdldEdTdHJlYW1lck1v bm9BdWRpb0NhcHMocHJpdi0+c2FtcGxlUmF0ZSkpOwotICAgICAgICAgICAgR3N0QXVkaW9JbmZv IGluZm87Ci0gICAgICAgICAgICBnc3RfYXVkaW9faW5mb19mcm9tX2NhcHMoJmluZm8sIG1vbm9D YXBzLmdldCgpKTsKLSAgICAgICAgICAgIEdTVF9BVURJT19JTkZPX1BPU0lUSU9OKCZpbmZvLCAw KSA9IHdlYktpdFdlYkF1ZGlvR1N0cmVhbWVyQ2hhbm5lbFBvc2l0aW9uKGkpOwotICAgICAgICAg ICAgR1JlZlB0cjxHc3RDYXBzPiBjYXBzV2l0aENoYW5uZWxQb3NpdGlvbiA9IGFkb3B0R1JlZihn c3RfYXVkaW9faW5mb190b19jYXBzKCZpbmZvKSk7Ci0gICAgICAgICAgICBnc3RfcGFkX3NlbmRf ZXZlbnQoc2lua1BhZC5nZXQoKSwgZ3N0X2V2ZW50X25ld19jYXBzKGNhcHNXaXRoQ2hhbm5lbFBv c2l0aW9uLmdldCgpKSk7Ci0KLSAgICAgICAgICAgIGdzdF9wYWRfc2VuZF9ldmVudChzaW5rUGFk LmdldCgpLCBnc3RfZXZlbnRfbmV3X3NlZ21lbnQoJnByaXYtPnNlZ21lbnQpKTsKLSAgICAgICAg fQotCi0gICAgICAgIEdzdEZsb3dSZXR1cm4gcmV0ID0gZ3N0X3BhZF9jaGFpbihwYWQsIGNoYW5u ZWxCdWZmZXIpOworICAgICAgICBHc3RGbG93UmV0dXJuIHJldCA9IGdzdF9hcHBfc3JjX3B1c2hf YnVmZmVyKEdTVF9BUFBfU1JDKGFwcHNyYyksIGNoYW5uZWxCdWZmZXIpOwogICAgICAgICBpZiAo cmV0ICE9IEdTVF9GTE9XX09LKSB7Ci0gICAgICAgICAgICBHU1RfRUxFTUVOVF9FUlJPUihzcmMs IENPUkUsIFBBRCwgKCJJbnRlcm5hbCBXZWJBdWRpb1NyYyBlcnJvciIpLCAoIkZhaWxlZCB0byBw dXNoIGJ1ZmZlciBvbiAlczolcyBmbG93OiAlcyIsIEdTVF9ERUJVR19QQURfTkFNRShwYWQpLCBn c3RfZmxvd19nZXRfbmFtZShyZXQpKSk7CisgICAgICAgICAgICBHU1RfRUxFTUVOVF9FUlJPUihz cmMsIENPUkUsIFBBRCwgKCJJbnRlcm5hbCBXZWJBdWRpb1NyYyBlcnJvciIpLCAoIkZhaWxlZCB0 byBwdXNoIGJ1ZmZlciBvbiAlcyBmbG93OiAlcyIsIEdTVF9PQkpFQ1RfTkFNRShhcHBzcmMpLCBn c3RfZmxvd19nZXRfbmFtZShyZXQpKSk7CiAgICAgICAgICAgICBnc3RfdGFza19wYXVzZShzcmMt PnByaXYtPnRhc2suZ2V0KCkpOwogICAgICAgICB9CiAgICAgfQogCi0gICAgcHJpdi0+bmV3U3Ry ZWFtRXZlbnRQZW5kaW5nID0gZmFsc2U7Ci0KICAgICBnX3NsaXN0X2ZyZWUoY2hhbm5lbEJ1ZmZl ckxpc3QpOwogfQogCkBAIC00NDQsNyArNDA3LDcgQEAgc3RhdGljIEdzdFN0YXRlQ2hhbmdlUmV0 dXJuIHdlYktpdFdlYkF1ZGlvU3JjQ2hhbmdlU3RhdGUoR3N0RWxlbWVudCogZWxlbWVudCwgR3MK ICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJSRUFEWS0+UEFVU0VEIik7CiAgICAgICAg IHNyYy0+cHJpdi0+cG9vbCA9IGdzdF9idWZmZXJfcG9vbF9uZXcoKTsKICAgICAgICAgY29uZmln ID0gZ3N0X2J1ZmZlcl9wb29sX2dldF9jb25maWcoc3JjLT5wcml2LT5wb29sKTsKLSAgICAgICAg Z3N0X2J1ZmZlcl9wb29sX2NvbmZpZ19zZXRfcGFyYW1zKGNvbmZpZywgbnVsbHB0ciwgc3JjLT5w cml2LT5mcmFtZXNUb1B1bGwgKiBzaXplb2YoZmxvYXQpLCAwLCAwKTsKKyAgICAgICAgZ3N0X2J1 ZmZlcl9wb29sX2NvbmZpZ19zZXRfcGFyYW1zKGNvbmZpZywgbnVsbHB0ciwgc3JjLT5wcml2LT5i dWZmZXJTaXplLCAwLCAwKTsKICAgICAgICAgZ3N0X2J1ZmZlcl9wb29sX3NldF9jb25maWcoc3Jj LT5wcml2LT5wb29sLCBjb25maWcpOwogICAgICAgICBpZiAoIWdzdF9idWZmZXJfcG9vbF9zZXRf YWN0aXZlKHNyYy0+cHJpdi0+cG9vbCwgVFJVRSkpCiAgICAgICAgICAgICByZXR1cm5WYWx1ZSA9 IEdTVF9TVEFURV9DSEFOR0VfRkFJTFVSRTsKQEAgLTQ1Myw3ICs0MTYsNiBAQCBzdGF0aWMgR3N0 U3RhdGVDaGFuZ2VSZXR1cm4gd2ViS2l0V2ViQXVkaW9TcmNDaGFuZ2VTdGF0ZShHc3RFbGVtZW50 KiBlbGVtZW50LCBHcwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgY2FzZSBHU1RfU1RBVEVf Q0hBTkdFX1BBVVNFRF9UT19SRUFEWToKLSAgICAgICAgc3JjLT5wcml2LT5uZXdTdHJlYW1FdmVu dFBlbmRpbmcgPSB0cnVlOwogICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHNyYywgIlBBVVNFRC0+ UkVBRFkiKTsKICAgICAgICAgaWYgKCFnc3RfdGFza19qb2luKHNyYy0+cHJpdi0+dGFzay5nZXQo KSkpCiAgICAgICAgICAgICByZXR1cm5WYWx1ZSA9IEdTVF9TVEFURV9DSEFOR0VfRkFJTFVSRTsK 243034 2014-12-10 09:47:33 -0800 2014-12-10 09:48:01 -0800 Patch bug-139490-20141210184902.patch text/plain 4537 slomo U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTBlOTg2NThjMDJmOWJi ZWQzMTQyY2UwYmNmYmM2YWI0YTYzNjA3Zi4uNmEwM2VkNWI3OTViMmQxMzMzMDQwYTUzYzhjNTU1 MTUzM2FmZTkwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTEyLTEwICBTZWJh c3RpYW4gRHLDtmdlICA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KKworICAgICAgICBbR1N0 cmVhbWVyXSBVc2UgYSBidWZmZXIgcG9vbCBmb3IgYWxsb2NhdGlvbnMgaW4gdGhlIEF1ZGlvRGVz dGluYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzOTQ4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogcGxhdGZvcm0vYXVkaW8vZ3N0cmVhbWVyL1dlYktpdFdlYkF1ZGlvU291cmNlR1N0cmVhbWVy LmNwcDoKKyAgICAgICAgKHdlYktpdFdlYkF1ZGlvU3JjTG9vcCk6CisgICAgICAgICh3ZWJLaXRX ZWJBdWRpb1NyY0NoYW5nZVN0YXRlKToKKyAgICAgICAgVXNlIGEgYnVmZmVyIHBvb2wgZm9yIHRo ZSBhbGxvY2F0aW9ucyBpbnN0ZWFkIG9mIGFsbG9jYXRpbmcgYQorICAgICAgICBuZXcgc21hbGwg YnVmZmVyIGZvciBldmVyeSAxMjggc2FtcGxlcyB3ZSBwcm9kdWNlLgorCiAyMDE0LTEyLTA4ICBD aHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IGlPUzog Vm9pY2VPdmVyIGdldHMgaHVuZyBvbiBzb21lIHdlYnNpdGVzIGNvbnNpc3RlbnRseS4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9XZWJLaXRXZWJB dWRpb1NvdXJjZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9n c3RyZWFtZXIvV2ViS2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIuY3BwCmluZGV4IGZkZGUwMzk0 NTIwYzU1YTcwY2RjYjQxNTFmNWZkNzk0ZjVkY2MwOTMuLjI1OTNlOWI1MzhlMWE4Yzk5NjE2MDUx NDkwNzYyOTU2ZTA4MjI5NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1 ZGlvL2dzdHJlYW1lci9XZWJLaXRXZWJBdWRpb1NvdXJjZUdTdHJlYW1lci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vZ3N0cmVhbWVyL1dlYktpdFdlYkF1ZGlvU291cmNl R1N0cmVhbWVyLmNwcApAQCAtNjQsNiArNjQsOCBAQCBzdHJ1Y3QgX1dlYktpdFdlYkF1ZGlvU291 cmNlUHJpdmF0ZSB7CiAgICAgYm9vbCBuZXdTdHJlYW1FdmVudFBlbmRpbmc7CiAgICAgR3N0U2Vn bWVudCBzZWdtZW50OwogICAgIGd1aW50NjQgbnVtYmVyT2ZTYW1wbGVzOworCisgICAgR3N0QnVm ZmVyUG9vbCogcG9vbDsKIH07CiAKIGVudW0gewpAQCAtMzE4LDYgKzMyMCw3IEBAIHN0YXRpYyB2 b2lkIHdlYktpdFdlYkF1ZGlvU3JjTG9vcChXZWJLaXRXZWJBdWRpb1NyYyogc3JjKQogICAgIEFT U0VSVChwcml2LT5idXMpOwogICAgIEFTU0VSVChwcml2LT5wcm92aWRlcik7CiAgICAgaWYgKCFw cml2LT5wcm92aWRlciB8fCAhcHJpdi0+YnVzKSB7CisgICAgICAgIEdTVF9FTEVNRU5UX0VSUk9S KHNyYywgQ09SRSwgRkFJTEVELCAoIkludGVybmFsIFdlYkF1ZGlvU3JjIGVycm9yIiksICgiQ2Fu J3Qgc3RhcnQgd2l0aG91dCBwcm92aWRlciBvciBidXMiKSk7CiAgICAgICAgIGdzdF90YXNrX3Bh dXNlKHNyYy0+cHJpdi0+dGFzay5nZXQoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0z MjgsMTAgKzMzMSwyNiBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJBdWRpb1NyY0xvb3AoV2ViS2l0 V2ViQXVkaW9TcmMqIHNyYykKIAogICAgIEdTTGlzdCogY2hhbm5lbEJ1ZmZlckxpc3QgPSAwOwog ICAgIHJlZ2lzdGVyIGludCBpOwotICAgIHVuc2lnbmVkIGJ1ZmZlclNpemUgPSBwcml2LT5mcmFt ZXNUb1B1bGwgKiBzaXplb2YoZmxvYXQpOwogICAgIGZvciAoaSA9IGdfc2xpc3RfbGVuZ3RoKHBy aXYtPnBhZHMpIC0gMTsgaSA+PSAwOyBpLS0pIHsKICAgICAgICAgQXVkaW9TcmNCdWZmZXIqIGJ1 ZmZlciA9IGdfbmV3KEF1ZGlvU3JjQnVmZmVyLCAxKTsKLSAgICAgICAgR3N0QnVmZmVyKiBjaGFu bmVsQnVmZmVyID0gZ3N0X2J1ZmZlcl9uZXdfYW5kX2FsbG9jKGJ1ZmZlclNpemUpOworICAgICAg ICBHc3RCdWZmZXIqIGNoYW5uZWxCdWZmZXI7CisKKyAgICAgICAgR3N0Rmxvd1JldHVybiByZXQg PSBnc3RfYnVmZmVyX3Bvb2xfYWNxdWlyZV9idWZmZXIocHJpdi0+cG9vbCwgJmNoYW5uZWxCdWZm ZXIsIG51bGxwdHIpOworCisgICAgICAgIGlmIChyZXQgIT0gR1NUX0ZMT1dfT0spIHsKKyAgICAg ICAgICAgIGdfZnJlZShidWZmZXIpOworICAgICAgICAgICAgd2hpbGUgKGNoYW5uZWxCdWZmZXJM aXN0KSB7CisgICAgICAgICAgICAgICAgYnVmZmVyID0gc3RhdGljX2Nhc3Q8QXVkaW9TcmNCdWZm ZXIqPihjaGFubmVsQnVmZmVyTGlzdC0+ZGF0YSk7CisgICAgICAgICAgICAgICAgZ3N0X2J1ZmZl cl91bm1hcChidWZmZXItPmJ1ZmZlciwgJmJ1ZmZlci0+aW5mbyk7CisgICAgICAgICAgICAgICAg Z3N0X2J1ZmZlcl91bnJlZihidWZmZXItPmJ1ZmZlcik7CisgICAgICAgICAgICAgICAgZ19mcmVl KGJ1ZmZlcik7CisgICAgICAgICAgICAgICAgY2hhbm5lbEJ1ZmZlckxpc3QgPSBnX3NsaXN0X2Rl bGV0ZV9saW5rKGNoYW5uZWxCdWZmZXJMaXN0LCBjaGFubmVsQnVmZmVyTGlzdCk7CisgICAgICAg ICAgICB9CisgICAgICAgICAgICBHU1RfRUxFTUVOVF9FUlJPUihzcmMsIENPUkUsIFBBRCwgKCJJ bnRlcm5hbCBXZWJBdWRpb1NyYyBlcnJvciIpLCAoIkZhaWxlZCB0byBhbGxvY2F0ZSBidWZmZXIg Zm9yIGZsb3c6ICVzIiwgZ3N0X2Zsb3dfZ2V0X25hbWUocmV0KSkpOworICAgICAgICAgICAgZ3N0 X3Rhc2tfcGF1c2Uoc3JjLT5wcml2LT50YXNrLmdldCgpKTsKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgfQorCiAgICAgICAgIEFTU0VSVChjaGFubmVsQnVmZmVyKTsKICAgICAgICAgYnVm ZmVyLT5idWZmZXIgPSBjaGFubmVsQnVmZmVyOwogICAgICAgICBHU1RfQlVGRkVSX1RJTUVTVEFN UChjaGFubmVsQnVmZmVyKSA9IHRpbWVzdGFtcDsKQEAgLTQyMSwxNiArNDQwLDI2IEBAIHN0YXRp YyBHc3RTdGF0ZUNoYW5nZVJldHVybiB3ZWJLaXRXZWJBdWRpb1NyY0NoYW5nZVN0YXRlKEdzdEVs ZW1lbnQqIGVsZW1lbnQsIEdzCiAgICAgfQogCiAgICAgc3dpdGNoICh0cmFuc2l0aW9uKSB7Ci0g ICAgY2FzZSBHU1RfU1RBVEVfQ0hBTkdFX1JFQURZX1RPX1BBVVNFRDoKKyAgICBjYXNlIEdTVF9T VEFURV9DSEFOR0VfUkVBRFlfVE9fUEFVU0VEOiB7CiAgICAgICAgIEdTVF9ERUJVR19PQkpFQ1Qo c3JjLCAiUkVBRFktPlBBVVNFRCIpOwotICAgICAgICBpZiAoIWdzdF90YXNrX3N0YXJ0KHNyYy0+ cHJpdi0+dGFzay5nZXQoKSkpCisgICAgICAgIHNyYy0+cHJpdi0+cG9vbCA9IGdzdF9idWZmZXJf cG9vbF9uZXcoKTsKKyAgICAgICAgR3N0U3RydWN0dXJlKiBjb25maWcgPSBnc3RfYnVmZmVyX3Bv b2xfZ2V0X2NvbmZpZyhzcmMtPnByaXYtPnBvb2wpOworICAgICAgICBnc3RfYnVmZmVyX3Bvb2xf Y29uZmlnX3NldF9wYXJhbXMoY29uZmlnLCBudWxscHRyLCBzcmMtPnByaXYtPmZyYW1lc1RvUHVs bCAqIHNpemVvZihmbG9hdCksIDAsIDApOworICAgICAgICBnc3RfYnVmZmVyX3Bvb2xfc2V0X2Nv bmZpZyhzcmMtPnByaXYtPnBvb2wsIGNvbmZpZyk7CisgICAgICAgIGlmICghZ3N0X2J1ZmZlcl9w b29sX3NldF9hY3RpdmUoc3JjLT5wcml2LT5wb29sLCBUUlVFKSkKKyAgICAgICAgICAgIHJldHVy blZhbHVlID0gR1NUX1NUQVRFX0NIQU5HRV9GQUlMVVJFOworICAgICAgICBlbHNlIGlmICghZ3N0 X3Rhc2tfc3RhcnQoc3JjLT5wcml2LT50YXNrLmdldCgpKSkKICAgICAgICAgICAgIHJldHVyblZh bHVlID0gR1NUX1NUQVRFX0NIQU5HRV9GQUlMVVJFOwogICAgICAgICBicmVhazsKKyAgICB9CiAg ICAgY2FzZSBHU1RfU1RBVEVfQ0hBTkdFX1BBVVNFRF9UT19SRUFEWToKICAgICAgICAgc3JjLT5w cml2LT5uZXdTdHJlYW1FdmVudFBlbmRpbmcgPSB0cnVlOwogICAgICAgICBHU1RfREVCVUdfT0JK RUNUKHNyYywgIlBBVVNFRC0+UkVBRFkiKTsKICAgICAgICAgaWYgKCFnc3RfdGFza19qb2luKHNy Yy0+cHJpdi0+dGFzay5nZXQoKSkpCiAgICAgICAgICAgICByZXR1cm5WYWx1ZSA9IEdTVF9TVEFU RV9DSEFOR0VfRkFJTFVSRTsKKyAgICAgICAgZ3N0X2J1ZmZlcl9wb29sX3NldF9hY3RpdmUoc3Jj LT5wcml2LT5wb29sLCBGQUxTRSk7CisgICAgICAgIGdzdF9vYmplY3RfdW5yZWYoc3JjLT5wcml2 LT5wb29sKTsKKyAgICAgICAgc3JjLT5wcml2LT5wb29sID0gbnVsbHB0cjsKICAgICAgICAgYnJl YWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgYnJlYWs7Cg== 243035 2014-12-10 09:48:06 -0800 2014-12-10 10:19:28 -0800 Patch bug-139490-20141210184935.patch text/plain 11357 slomo U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmEwM2VkNWI3OTViMmQx MzMzMDQwYTUzYzhjNTU1MTUzM2FmZTkwNS4uNTI3ZmY0MWFmYzczNTMwNWNiZTViYjAwOWU2MzJi YjRlMzk2OTUwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE0LTEyLTEwICBTZWJh c3RpYW4gRHLDtmdlICA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KIAorICAgICAgICBbR1N0 cmVhbWVyXSBVc2UgYXBwc3JjcyBpbnN0ZWFkIG9mIHVuY29ubmVjdGVkIHF1ZXVlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NDkwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRp by9nc3RyZWFtZXIvV2ViS2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIuY3BwOgorICAgICAgICAo d2Via2l0X3dlYl9hdWRpb19zcmNfaW5pdCk6CisgICAgICAgICh3ZWJLaXRXZWJBdWRpb1NyY0Nv bnN0cnVjdGVkKToKKyAgICAgICAgKHdlYktpdFdlYkF1ZGlvU3JjRmluYWxpemUpOgorICAgICAg ICAod2ViS2l0V2ViQXVkaW9TcmNTZXRQcm9wZXJ0eSk6CisgICAgICAgICh3ZWJLaXRXZWJBdWRp b1NyY0xvb3ApOgorICAgICAgICAod2ViS2l0V2ViQXVkaW9TcmNDaGFuZ2VTdGF0ZSk6CisgICAg ICAgIFByZXZpb3VzbHkgd2UgZGlyZWN0bHkgY2hhaW5lZCBidWZmZXJzIGludG8gdW5jb25uZWN0 ZWQgcXVldWVzLAorICAgICAgICB3aGljaCBjb25mdXNlZCBzb21lIGNvZGUgaW5zaWRlIEdTdHJl YW1lciBhbmQgY2F1c2VkIHNvbWUgaGFybWxlc3MKKyAgICAgICAgd2FybmluZ3MuIE5vdyB3ZSB1 c2UgYXBwc3JjcyBpbnN0ZWFkLCB3aGljaCBhbHNvIGFsbG93cyB1cyB0byByZW1vdmUKKyAgICAg ICAgcXVpdGUgc29tZSBjb2RlLgorCisyMDE0LTEyLTEwICBTZWJhc3RpYW4gRHLDtmdlICA8c2Vi YXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KKwogICAgICAgICBbR1N0cmVhbWVyXSBVc2UgYSBidWZm ZXIgcG9vbCBmb3IgYWxsb2NhdGlvbnMgaW4gdGhlIEF1ZGlvRGVzdGluYXRpb24KICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTQ4NwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIvV2ViS2l0V2ViQXVk aW9Tb3VyY2VHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vZ3N0 cmVhbWVyL1dlYktpdFdlYkF1ZGlvU291cmNlR1N0cmVhbWVyLmNwcAppbmRleCAyNTkzZTliNTM4 ZTFhOGM5OTYxNjA1MTQ5MDc2Mjk1NmUwODIyOTU4Li43OTQ4Zjg2ODBlZTc0OTU2YTQ2MGU2ZDU4 YjM5ZGViN2ZjM2RmMDc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRp by9nc3RyZWFtZXIvV2ViS2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9XZWJLaXRXZWJBdWRpb1NvdXJjZUdT dHJlYW1lci5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJBdWRpb0lPQ2FsbGJhY2su aCIKICNpbmNsdWRlICJHUmVmUHRyR1N0cmVhbWVyLmgiCiAjaW5jbHVkZSAiR1N0cmVhbWVyVXRp bGl0aWVzLmgiCisjaW5jbHVkZSA8Z3N0L2FwcC9hcHAuaD4KICNpbmNsdWRlIDxnc3QvYXVkaW8v YXVkaW8uaD4KICNpbmNsdWRlIDxnc3QvcGJ1dGlscy9wYnV0aWxzLmg+CiAjaW5jbHVkZSA8d3Rm L2dvYmplY3QvR1VuaXF1ZVB0ci5oPgpAQCAtNTIsMTcgKzUzLDE2IEBAIHN0cnVjdCBfV2ViS2l0 V2ViQXVkaW9Tb3VyY2VQcml2YXRlIHsKICAgICBBdWRpb0J1cyogYnVzOwogICAgIEF1ZGlvSU9D YWxsYmFjayogcHJvdmlkZXI7CiAgICAgZ3VpbnQgZnJhbWVzVG9QdWxsOworICAgIGd1aW50IGJ1 ZmZlclNpemU7CiAKICAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IGludGVybGVhdmU7CiAKICAgICBH UmVmUHRyPEdzdFRhc2s+IHRhc2s7CiAgICAgR1JlY011dGV4IG11dGV4OwogCi0gICAgR1NMaXN0 KiBwYWRzOyAvLyBMaXN0IG9mIHF1ZXVlIHNpbmsgcGFkcy4gT25lIHF1ZXVlIGZvciBlYWNoIHBs YW5hciBhdWRpbyBjaGFubmVsLgorICAgIEdTTGlzdCogc291cmNlczsgLy8gTGlzdCBvZiBhcHBz cmMuIE9uZSBhcHBzcmMgZm9yIGVhY2ggcGxhbmFyIGF1ZGlvIGNoYW5uZWwuCiAgICAgR3N0UGFk KiBzb3VyY2VQYWQ7IC8vIHNyYyBwYWQgb2YgdGhlIGVsZW1lbnQsIGludGVybGVhdmVkIHdhdiBk YXRhIGlzIHB1c2hlZCB0byBpdC4KIAotICAgIGJvb2wgbmV3U3RyZWFtRXZlbnRQZW5kaW5nOwot ICAgIEdzdFNlZ21lbnQgc2VnbWVudDsKICAgICBndWludDY0IG51bWJlck9mU2FtcGxlczsKIAog ICAgIEdzdEJ1ZmZlclBvb2wqIHBvb2w7CkBAIC0xOTIsOSArMTkyLDYgQEAgc3RhdGljIHZvaWQg d2Via2l0X3dlYl9hdWRpb19zcmNfaW5pdChXZWJLaXRXZWJBdWRpb1NyYyogc3JjKQogICAgIHBy aXYtPnByb3ZpZGVyID0gMDsKICAgICBwcml2LT5idXMgPSAwOwogCi0gICAgcHJpdi0+bmV3U3Ry ZWFtRXZlbnRQZW5kaW5nID0gdHJ1ZTsKLSAgICBnc3Rfc2VnbWVudF9pbml0KCZwcml2LT5zZWdt ZW50LCBHU1RfRk9STUFUX1RJTUUpOwotCiAgICAgZ19yZWNfbXV0ZXhfaW5pdCgmcHJpdi0+bXV0 ZXgpOwogICAgIHByaXYtPnRhc2sgPSBnc3RfdGFza19uZXcocmVpbnRlcnByZXRfY2FzdDxHc3RU YXNrRnVuY3Rpb24+KHdlYktpdFdlYkF1ZGlvU3JjTG9vcCksIHNyYywgMCk7CiAKQEAgLTIxMCw3 ICsyMDcsNyBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJBdWRpb1NyY0NvbnN0cnVjdGVkKEdPYmpl Y3QqIG9iamVjdCkKICAgICBBU1NFUlQocHJpdi0+cHJvdmlkZXIpOwogICAgIEFTU0VSVChwcml2 LT5zYW1wbGVSYXRlKTsKIAotICAgIHByaXYtPmludGVybGVhdmUgPSBnc3RfZWxlbWVudF9mYWN0 b3J5X21ha2UoImludGVybGVhdmUiLCAwKTsKKyAgICBwcml2LT5pbnRlcmxlYXZlID0gZ3N0X2Vs ZW1lbnRfZmFjdG9yeV9tYWtlKCJpbnRlcmxlYXZlIiwgbnVsbHB0cik7CiAKICAgICBpZiAoIXBy aXYtPmludGVybGVhdmUpIHsKICAgICAgICAgR1NUX0VSUk9SX09CSkVDVChzcmMsICJGYWlsZWQg dG8gY3JlYXRlIGludGVybGVhdmUiKTsKQEAgLTIyMCwzNCArMjE3LDI5IEBAIHN0YXRpYyB2b2lk IHdlYktpdFdlYkF1ZGlvU3JjQ29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQogICAgIGdzdF9i aW5fYWRkKEdTVF9CSU4oc3JjKSwgcHJpdi0+aW50ZXJsZWF2ZS5nZXQoKSk7CiAKICAgICAvLyBG b3IgZWFjaCBjaGFubmVsIG9mIHRoZSBidXMgY3JlYXRlIGEgbmV3IHVwc3RyZWFtIGJyYW5jaCBm b3IgaW50ZXJsZWF2ZSwgbGlrZToKLSAgICAvLyBxdWV1ZSAhIGNhcHNmaWx0ZXIuIHdoaWNoIGlz IHBsdWdnZWQgdG8gYSBuZXcgaW50ZXJsZWF2ZSByZXF1ZXN0IHNpbmtwYWQuCisgICAgLy8gYXBw c3JjICEgLiB3aGljaCBpcyBwbHVnZ2VkIHRvIGEgbmV3IGludGVybGVhdmUgcmVxdWVzdCBzaW5r cGFkLgogICAgIGZvciAodW5zaWduZWQgY2hhbm5lbEluZGV4ID0gMDsgY2hhbm5lbEluZGV4IDwg cHJpdi0+YnVzLT5udW1iZXJPZkNoYW5uZWxzKCk7IGNoYW5uZWxJbmRleCsrKSB7Ci0gICAgICAg IEdVbmlxdWVQdHI8Z2NoYXI+IHF1ZXVlTmFtZShnX3N0cmR1cF9wcmludGYoIndlYmF1ZGlvUXVl dWUldSIsIGNoYW5uZWxJbmRleCkpOwotICAgICAgICBHc3RFbGVtZW50KiBxdWV1ZSA9IGdzdF9l bGVtZW50X2ZhY3RvcnlfbWFrZSgicXVldWUiLCBxdWV1ZU5hbWUuZ2V0KCkpOwotICAgICAgICBH c3RFbGVtZW50KiBjYXBzZmlsdGVyID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJjYXBzZmls dGVyIiwgMCk7Ci0KKyAgICAgICAgR1VuaXF1ZVB0cjxnY2hhcj4gYXBwc3JjTmFtZShnX3N0cmR1 cF9wcmludGYoIndlYmF1ZGlvU3JjJXUiLCBjaGFubmVsSW5kZXgpKTsKKyAgICAgICAgR1JlZlB0 cjxHc3RFbGVtZW50PiBhcHBzcmMgPSBhZG9wdEdSZWYoZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtl KCJhcHBzcmMiLCBhcHBzcmNOYW1lLmdldCgpKSk7CiAgICAgICAgIEdSZWZQdHI8R3N0Q2Fwcz4g bW9ub0NhcHMgPSBhZG9wdEdSZWYoZ2V0R1N0cmVhbWVyTW9ub0F1ZGlvQ2Fwcyhwcml2LT5zYW1w bGVSYXRlKSk7CiAKICAgICAgICAgR3N0QXVkaW9JbmZvIGluZm87CiAgICAgICAgIGdzdF9hdWRp b19pbmZvX2Zyb21fY2FwcygmaW5mbywgbW9ub0NhcHMuZ2V0KCkpOwogICAgICAgICBHU1RfQVVE SU9fSU5GT19QT1NJVElPTigmaW5mbywgMCkgPSB3ZWJLaXRXZWJBdWRpb0dTdHJlYW1lckNoYW5u ZWxQb3NpdGlvbihjaGFubmVsSW5kZXgpOwogICAgICAgICBHUmVmUHRyPEdzdENhcHM+IGNhcHMg PSBhZG9wdEdSZWYoZ3N0X2F1ZGlvX2luZm9fdG9fY2FwcygmaW5mbykpOwotICAgICAgICBnX29i amVjdF9zZXQoY2Fwc2ZpbHRlciwgImNhcHMiLCBjYXBzLmdldCgpLCBOVUxMKTsKIAotICAgICAg ICAvLyBDb25maWd1cmUgdGhlIHF1ZXVlIGZvciBtaW5pbWFsIGxhdGVuY3kuCi0gICAgICAgIGdf b2JqZWN0X3NldChxdWV1ZSwgIm1heC1zaXplLWJ1ZmZlcnMiLCBzdGF0aWNfY2FzdDxndWludD4o MSksIE5VTEwpOworICAgICAgICAvLyBDb25maWd1cmUgdGhlIGFwcHNyYyBmb3IgbWluaW1hbCBs YXRlbmN5LgorICAgICAgICBnX29iamVjdF9zZXQoYXBwc3JjLmdldCgpLCAibWF4LWJ5dGVzIiwg MiAqIHByaXYtPmJ1ZmZlclNpemUsICJibG9jayIsIFRSVUUsCisgICAgICAgICAgICAiZm9ybWF0 IiwgR1NUX0ZPUk1BVF9USU1FLCAiY2FwcyIsIGNhcHMuZ2V0KCksIG51bGxwdHIpOwogCi0gICAg ICAgIEdzdFBhZCogcGFkID0gZ3N0X2VsZW1lbnRfZ2V0X3N0YXRpY19wYWQocXVldWUsICJzaW5r Iik7Ci0gICAgICAgIHByaXYtPnBhZHMgPSBnX3NsaXN0X3ByZXBlbmQocHJpdi0+cGFkcywgcGFk KTsKLQotICAgICAgICBnc3RfYmluX2FkZF9tYW55KEdTVF9CSU4oc3JjKSwgcXVldWUsIGNhcHNm aWx0ZXIsIE5VTEwpOwotICAgICAgICBnc3RfZWxlbWVudF9saW5rX3BhZHNfZnVsbChxdWV1ZSwg InNyYyIsIGNhcHNmaWx0ZXIsICJzaW5rIiwgR1NUX1BBRF9MSU5LX0NIRUNLX05PVEhJTkcpOwot ICAgICAgICBnc3RfZWxlbWVudF9saW5rX3BhZHNfZnVsbChjYXBzZmlsdGVyLCAic3JjIiwgcHJp di0+aW50ZXJsZWF2ZS5nZXQoKSwgInNpbmtfJXUiLCBHU1RfUEFEX0xJTktfQ0hFQ0tfTk9USElO Ryk7CisgICAgICAgIHByaXYtPnNvdXJjZXMgPSBnX3NsaXN0X3ByZXBlbmQocHJpdi0+c291cmNl cywgYXBwc3JjLmxlYWtSZWYoKSk7CiAKKyAgICAgICAgZ3N0X2Jpbl9hZGQoR1NUX0JJTihzcmMp LCBhcHBzcmMubGVha1JlZigpKTsKKyAgICAgICAgZ3N0X2VsZW1lbnRfbGlua19wYWRzX2Z1bGwo YXBwc3JjLmdldCgpLCAic3JjIiwgcHJpdi0+aW50ZXJsZWF2ZS5nZXQoKSwgInNpbmtfJXUiLCBH U1RfUEFEX0xJTktfQ0hFQ0tfTk9USElORyk7CiAgICAgfQotICAgIHByaXYtPnBhZHMgPSBnX3Ns aXN0X3JldmVyc2UocHJpdi0+cGFkcyk7CisgICAgcHJpdi0+c291cmNlcyA9IGdfc2xpc3RfcmV2 ZXJzZShwcml2LT5zb3VyY2VzKTsKIAotICAgIC8vIHdhdmVuYydzIHNyYyBwYWQgaXMgdGhlIG9u bHkgdmlzaWJsZSBwYWQgb2Ygb3VyIGVsZW1lbnQuCisgICAgLy8gaW50ZXJsZWF2ZSdzIHNyYyBw YWQgaXMgdGhlIG9ubHkgdmlzaWJsZSBwYWQgb2Ygb3VyIGVsZW1lbnQuCiAgICAgR1JlZlB0cjxH c3RQYWQ+IHRhcmdldFBhZCA9IGFkb3B0R1JlZihnc3RfZWxlbWVudF9nZXRfc3RhdGljX3BhZChw cml2LT5pbnRlcmxlYXZlLmdldCgpLCAic3JjIikpOwogICAgIGdzdF9naG9zdF9wYWRfc2V0X3Rh cmdldChHU1RfR0hPU1RfUEFEKHByaXYtPnNvdXJjZVBhZCksIHRhcmdldFBhZC5nZXQoKSk7CiB9 CkBAIC0yNTksNyArMjUxLDcgQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViQXVkaW9TcmNGaW5hbGl6 ZShHT2JqZWN0KiBvYmplY3QpCiAKICAgICBnX3JlY19tdXRleF9jbGVhcigmcHJpdi0+bXV0ZXgp OwogCi0gICAgZ19zbGlzdF9mcmVlX2Z1bGwocHJpdi0+cGFkcywgcmVpbnRlcnByZXRfY2FzdDxH RGVzdHJveU5vdGlmeT4oZ3N0X29iamVjdF91bnJlZikpOworICAgIGdfc2xpc3RfZnJlZV9mdWxs KHByaXYtPnNvdXJjZXMsIHJlaW50ZXJwcmV0X2Nhc3Q8R0Rlc3Ryb3lOb3RpZnk+KGdzdF9vYmpl Y3RfdW5yZWYpKTsKIAogICAgIHByaXYtPn5XZWJLaXRXZWJBdWRpb1NvdXJjZVByaXZhdGUoKTsK ICAgICBHU1RfQ0FMTF9QQVJFTlQoR19PQkpFQ1RfQ0xBU1MsIGZpbmFsaXplLCAoKEdPYmplY3Qq ICkoc3JjKSkpOwpAQCAtMjgyLDYgKzI3NCw3IEBAIHN0YXRpYyB2b2lkIHdlYktpdFdlYkF1ZGlv U3JjU2V0UHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBndWludCBwcm9wZXJ0eUlkLCBjb25zCiAg ICAgICAgIGJyZWFrOwogICAgIGNhc2UgUFJPUF9GUkFNRVM6CiAgICAgICAgIHByaXYtPmZyYW1l c1RvUHVsbCA9IGdfdmFsdWVfZ2V0X3VpbnQodmFsdWUpOworICAgICAgICBwcml2LT5idWZmZXJT aXplID0gc2l6ZW9mKGZsb2F0KSAqIHByaXYtPmZyYW1lc1RvUHVsbDsKICAgICAgICAgYnJlYWs7 CiAgICAgZGVmYXVsdDoKICAgICAgICAgR19PQkpFQ1RfV0FSTl9JTlZBTElEX1BST1BFUlRZX0lE KG9iamVjdCwgcHJvcGVydHlJZCwgcHNwZWMpOwpAQCAtMzMxLDcgKzMyNCw3IEBAIHN0YXRpYyB2 b2lkIHdlYktpdFdlYkF1ZGlvU3JjTG9vcChXZWJLaXRXZWJBdWRpb1NyYyogc3JjKQogCiAgICAg R1NMaXN0KiBjaGFubmVsQnVmZmVyTGlzdCA9IDA7CiAgICAgcmVnaXN0ZXIgaW50IGk7Ci0gICAg Zm9yIChpID0gZ19zbGlzdF9sZW5ndGgocHJpdi0+cGFkcykgLSAxOyBpID49IDA7IGktLSkgewor ICAgIGZvciAoaSA9IGdfc2xpc3RfbGVuZ3RoKHByaXYtPnNvdXJjZXMpIC0gMTsgaSA+PSAwOyBp LS0pIHsKICAgICAgICAgQXVkaW9TcmNCdWZmZXIqIGJ1ZmZlciA9IGdfbmV3KEF1ZGlvU3JjQnVm ZmVyLCAxKTsKICAgICAgICAgR3N0QnVmZmVyKiBjaGFubmVsQnVmZmVyOwogCkBAIC0zNjMsMTcg KzM1NiwxMSBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJBdWRpb1NyY0xvb3AoV2ViS2l0V2ViQXVk aW9TcmMqIHNyYykKICAgICAvLyBGSVhNRTogQWRkIHN1cHBvcnQgZm9yIGxvY2FsL2xpdmUgYXVk aW8gaW5wdXQuCiAgICAgcHJpdi0+cHJvdmlkZXItPnJlbmRlcigwLCBwcml2LT5idXMsIHByaXYt PmZyYW1lc1RvUHVsbCk7CiAKLSAgICBHU0xpc3QqIHBhZHNJdCA9IHByaXYtPnBhZHM7CisgICAg R1NMaXN0KiBzb3VyY2VzSXQgPSBwcml2LT5zb3VyY2VzOwogICAgIEdTTGlzdCogYnVmZmVyc0l0 ID0gY2hhbm5lbEJ1ZmZlckxpc3Q7CiAKLSNpZiBHU1RfQ0hFQ0tfVkVSU0lPTigxLCAyLCAwKQot ICAgIGd1aW50IGdyb3VwSWQgPSAwOwotICAgIGlmIChwcml2LT5uZXdTdHJlYW1FdmVudFBlbmRp bmcpCi0gICAgICAgIGdyb3VwSWQgPSBnc3RfdXRpbF9ncm91cF9pZF9uZXh0KCk7Ci0jZW5kaWYK LQotICAgIGZvciAoaSA9IDA7IHBhZHNJdCAmJiBidWZmZXJzSXQ7IHBhZHNJdCA9IGdfc2xpc3Rf bmV4dChwYWRzSXQpLCBidWZmZXJzSXQgPSBnX3NsaXN0X25leHQoYnVmZmVyc0l0KSwgKytpKSB7 Ci0gICAgICAgIEdzdFBhZCogcGFkID0gc3RhdGljX2Nhc3Q8R3N0UGFkKj4ocGFkc0l0LT5kYXRh KTsKKyAgICBmb3IgKGkgPSAwOyBzb3VyY2VzSXQgJiYgYnVmZmVyc0l0OyBzb3VyY2VzSXQgPSBn X3NsaXN0X25leHQoc291cmNlc0l0KSwgYnVmZmVyc0l0ID0gZ19zbGlzdF9uZXh0KGJ1ZmZlcnNJ dCksICsraSkgeworICAgICAgICBHc3RFbGVtZW50KiBhcHBzcmMgPSBzdGF0aWNfY2FzdDxHc3RF bGVtZW50Kj4oc291cmNlc0l0LT5kYXRhKTsKICAgICAgICAgQXVkaW9TcmNCdWZmZXIqIGJ1ZmZl ciA9IHN0YXRpY19jYXN0PEF1ZGlvU3JjQnVmZmVyKj4oYnVmZmVyc0l0LT5kYXRhKTsKICAgICAg ICAgR3N0QnVmZmVyKiBjaGFubmVsQnVmZmVyID0gYnVmZmVyLT5idWZmZXI7CiAKQEAgLTM4MSwz NyArMzY4LDEzIEBAIHN0YXRpYyB2b2lkIHdlYktpdFdlYkF1ZGlvU3JjTG9vcChXZWJLaXRXZWJB dWRpb1NyYyogc3JjKQogICAgICAgICBnc3RfYnVmZmVyX3VubWFwKGNoYW5uZWxCdWZmZXIsICZi dWZmZXItPmluZm8pOwogICAgICAgICBnX2ZyZWUoYnVmZmVyKTsKIAotICAgICAgICAvLyBTZW5k IHN0cmVhbS1zdGFydCwgc2VnbWVudCBhbmQgY2FwcyBldmVudHMgZG93bnN0cmVhbSwgYWxvbmcg d2l0aCB0aGUgZmlyc3QgYnVmZmVyLgotICAgICAgICBpZiAocHJpdi0+bmV3U3RyZWFtRXZlbnRQ ZW5kaW5nKSB7Ci0gICAgICAgICAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IHF1ZXVlID0gYWRvcHRH UmVmKGdzdF9wYWRfZ2V0X3BhcmVudF9lbGVtZW50KHBhZCkpOwotICAgICAgICAgICAgR1JlZlB0 cjxHc3RQYWQ+IHNpbmtQYWQgPSBhZG9wdEdSZWYoZ3N0X2VsZW1lbnRfZ2V0X3N0YXRpY19wYWQo cXVldWUuZ2V0KCksICJzaW5rIikpOwotICAgICAgICAgICAgR1VuaXF1ZVB0cjxnY2hhcj4gcXVl dWVOYW1lKGdzdF9lbGVtZW50X2dldF9uYW1lKHF1ZXVlLmdldCgpKSk7Ci0gICAgICAgICAgICBH VW5pcXVlUHRyPGdjaGFyPiBzdHJlYW1JZChnX3N0cmR1cF9wcmludGYoIndlYmF1ZGlvLyVzIiwg cXVldWVOYW1lLmdldCgpKSk7Ci0gICAgICAgICAgICBHc3RFdmVudCogc3RyZWFtU3RhcnRFdmVu dCA9IGdzdF9ldmVudF9uZXdfc3RyZWFtX3N0YXJ0KHN0cmVhbUlkLmdldCgpKTsKLSNpZiBHU1Rf Q0hFQ0tfVkVSU0lPTigxLCAyLCAwKQotICAgICAgICAgICAgZ3N0X2V2ZW50X3NldF9ncm91cF9p ZChzdHJlYW1TdGFydEV2ZW50LCBncm91cElkKTsKLSNlbmRpZgotICAgICAgICAgICAgZ3N0X3Bh ZF9zZW5kX2V2ZW50KHNpbmtQYWQuZ2V0KCksIHN0cmVhbVN0YXJ0RXZlbnQpOwotCi0gICAgICAg ICAgICBHUmVmUHRyPEdzdENhcHM+IG1vbm9DYXBzID0gYWRvcHRHUmVmKGdldEdTdHJlYW1lck1v bm9BdWRpb0NhcHMocHJpdi0+c2FtcGxlUmF0ZSkpOwotICAgICAgICAgICAgR3N0QXVkaW9JbmZv IGluZm87Ci0gICAgICAgICAgICBnc3RfYXVkaW9faW5mb19mcm9tX2NhcHMoJmluZm8sIG1vbm9D YXBzLmdldCgpKTsKLSAgICAgICAgICAgIEdTVF9BVURJT19JTkZPX1BPU0lUSU9OKCZpbmZvLCAw KSA9IHdlYktpdFdlYkF1ZGlvR1N0cmVhbWVyQ2hhbm5lbFBvc2l0aW9uKGkpOwotICAgICAgICAg ICAgR1JlZlB0cjxHc3RDYXBzPiBjYXBzV2l0aENoYW5uZWxQb3NpdGlvbiA9IGFkb3B0R1JlZihn c3RfYXVkaW9faW5mb190b19jYXBzKCZpbmZvKSk7Ci0gICAgICAgICAgICBnc3RfcGFkX3NlbmRf ZXZlbnQoc2lua1BhZC5nZXQoKSwgZ3N0X2V2ZW50X25ld19jYXBzKGNhcHNXaXRoQ2hhbm5lbFBv c2l0aW9uLmdldCgpKSk7Ci0KLSAgICAgICAgICAgIGdzdF9wYWRfc2VuZF9ldmVudChzaW5rUGFk LmdldCgpLCBnc3RfZXZlbnRfbmV3X3NlZ21lbnQoJnByaXYtPnNlZ21lbnQpKTsKLSAgICAgICAg fQotCi0gICAgICAgIEdzdEZsb3dSZXR1cm4gcmV0ID0gZ3N0X3BhZF9jaGFpbihwYWQsIGNoYW5u ZWxCdWZmZXIpOworICAgICAgICBHc3RGbG93UmV0dXJuIHJldCA9IGdzdF9hcHBfc3JjX3B1c2hf YnVmZmVyKEdTVF9BUFBfU1JDKGFwcHNyYyksIGNoYW5uZWxCdWZmZXIpOwogICAgICAgICBpZiAo cmV0ICE9IEdTVF9GTE9XX09LKSB7Ci0gICAgICAgICAgICBHU1RfRUxFTUVOVF9FUlJPUihzcmMs IENPUkUsIFBBRCwgKCJJbnRlcm5hbCBXZWJBdWRpb1NyYyBlcnJvciIpLCAoIkZhaWxlZCB0byBw dXNoIGJ1ZmZlciBvbiAlczolcyBmbG93OiAlcyIsIEdTVF9ERUJVR19QQURfTkFNRShwYWQpLCBn c3RfZmxvd19nZXRfbmFtZShyZXQpKSk7CisgICAgICAgICAgICBHU1RfRUxFTUVOVF9FUlJPUihz cmMsIENPUkUsIFBBRCwgKCJJbnRlcm5hbCBXZWJBdWRpb1NyYyBlcnJvciIpLCAoIkZhaWxlZCB0 byBwdXNoIGJ1ZmZlciBvbiAlcyBmbG93OiAlcyIsIEdTVF9PQkpFQ1RfTkFNRShhcHBzcmMpLCBn c3RfZmxvd19nZXRfbmFtZShyZXQpKSk7CiAgICAgICAgICAgICBnc3RfdGFza19wYXVzZShzcmMt PnByaXYtPnRhc2suZ2V0KCkpOwogICAgICAgICB9CiAgICAgfQogCi0gICAgcHJpdi0+bmV3U3Ry ZWFtRXZlbnRQZW5kaW5nID0gZmFsc2U7Ci0KICAgICBnX3NsaXN0X2ZyZWUoY2hhbm5lbEJ1ZmZl ckxpc3QpOwogfQogCkBAIC00NDQsNyArNDA3LDcgQEAgc3RhdGljIEdzdFN0YXRlQ2hhbmdlUmV0 dXJuIHdlYktpdFdlYkF1ZGlvU3JjQ2hhbmdlU3RhdGUoR3N0RWxlbWVudCogZWxlbWVudCwgR3MK ICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJSRUFEWS0+UEFVU0VEIik7CiAgICAgICAg IHNyYy0+cHJpdi0+cG9vbCA9IGdzdF9idWZmZXJfcG9vbF9uZXcoKTsKICAgICAgICAgR3N0U3Ry dWN0dXJlKiBjb25maWcgPSBnc3RfYnVmZmVyX3Bvb2xfZ2V0X2NvbmZpZyhzcmMtPnByaXYtPnBv b2wpOwotICAgICAgICBnc3RfYnVmZmVyX3Bvb2xfY29uZmlnX3NldF9wYXJhbXMoY29uZmlnLCBu dWxscHRyLCBzcmMtPnByaXYtPmZyYW1lc1RvUHVsbCAqIHNpemVvZihmbG9hdCksIDAsIDApOwor ICAgICAgICBnc3RfYnVmZmVyX3Bvb2xfY29uZmlnX3NldF9wYXJhbXMoY29uZmlnLCBudWxscHRy LCBzcmMtPnByaXYtPmJ1ZmZlclNpemUsIDAsIDApOwogICAgICAgICBnc3RfYnVmZmVyX3Bvb2xf c2V0X2NvbmZpZyhzcmMtPnByaXYtPnBvb2wsIGNvbmZpZyk7CiAgICAgICAgIGlmICghZ3N0X2J1 ZmZlcl9wb29sX3NldF9hY3RpdmUoc3JjLT5wcml2LT5wb29sLCBUUlVFKSkKICAgICAgICAgICAg IHJldHVyblZhbHVlID0gR1NUX1NUQVRFX0NIQU5HRV9GQUlMVVJFOwpAQCAtNDUzLDcgKzQxNiw2 IEBAIHN0YXRpYyBHc3RTdGF0ZUNoYW5nZVJldHVybiB3ZWJLaXRXZWJBdWRpb1NyY0NoYW5nZVN0 YXRlKEdzdEVsZW1lbnQqIGVsZW1lbnQsIEdzCiAgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBj YXNlIEdTVF9TVEFURV9DSEFOR0VfUEFVU0VEX1RPX1JFQURZOgotICAgICAgICBzcmMtPnByaXYt Pm5ld1N0cmVhbUV2ZW50UGVuZGluZyA9IHRydWU7CiAgICAgICAgIEdTVF9ERUJVR19PQkpFQ1Qo c3JjLCAiUEFVU0VELT5SRUFEWSIpOwogICAgICAgICBpZiAoIWdzdF90YXNrX2pvaW4oc3JjLT5w cml2LT50YXNrLmdldCgpKSkKICAgICAgICAgICAgIHJldHVyblZhbHVlID0gR1NUX1NUQVRFX0NI QU5HRV9GQUlMVVJFOwo= 243044 2014-12-10 10:19:33 -0800 2014-12-10 10:58:23 -0800 Patch bug-139490-20141210192102.patch text/plain 11322 slomo U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmEwM2VkNWI3OTViMmQx MzMzMDQwYTUzYzhjNTU1MTUzM2FmZTkwNS4uNTI3ZmY0MWFmYzczNTMwNWNiZTViYjAwOWU2MzJi YjRlMzk2OTUwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE0LTEyLTEwICBTZWJh c3RpYW4gRHLDtmdlICA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KIAorICAgICAgICBbR1N0 cmVhbWVyXSBVc2UgYXBwc3JjcyBpbnN0ZWFkIG9mIHVuY29ubmVjdGVkIHF1ZXVlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NDkwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRp by9nc3RyZWFtZXIvV2ViS2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIuY3BwOgorICAgICAgICAo d2Via2l0X3dlYl9hdWRpb19zcmNfaW5pdCk6CisgICAgICAgICh3ZWJLaXRXZWJBdWRpb1NyY0Nv bnN0cnVjdGVkKToKKyAgICAgICAgKHdlYktpdFdlYkF1ZGlvU3JjRmluYWxpemUpOgorICAgICAg ICAod2ViS2l0V2ViQXVkaW9TcmNTZXRQcm9wZXJ0eSk6CisgICAgICAgICh3ZWJLaXRXZWJBdWRp b1NyY0xvb3ApOgorICAgICAgICAod2ViS2l0V2ViQXVkaW9TcmNDaGFuZ2VTdGF0ZSk6CisgICAg ICAgIFByZXZpb3VzbHkgd2UgZGlyZWN0bHkgY2hhaW5lZCBidWZmZXJzIGludG8gdW5jb25uZWN0 ZWQgcXVldWVzLAorICAgICAgICB3aGljaCBjb25mdXNlZCBzb21lIGNvZGUgaW5zaWRlIEdTdHJl YW1lciBhbmQgY2F1c2VkIHNvbWUgaGFybWxlc3MKKyAgICAgICAgd2FybmluZ3MuIE5vdyB3ZSB1 c2UgYXBwc3JjcyBpbnN0ZWFkLCB3aGljaCBhbHNvIGFsbG93cyB1cyB0byByZW1vdmUKKyAgICAg ICAgcXVpdGUgc29tZSBjb2RlLgorCisyMDE0LTEyLTEwICBTZWJhc3RpYW4gRHLDtmdlICA8c2Vi YXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KKwogICAgICAgICBbR1N0cmVhbWVyXSBVc2UgYSBidWZm ZXIgcG9vbCBmb3IgYWxsb2NhdGlvbnMgaW4gdGhlIEF1ZGlvRGVzdGluYXRpb24KICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTQ4NwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIvV2ViS2l0V2ViQXVk aW9Tb3VyY2VHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vZ3N0 cmVhbWVyL1dlYktpdFdlYkF1ZGlvU291cmNlR1N0cmVhbWVyLmNwcAppbmRleCAyNTkzZTliNTM4 ZTFhOGM5OTYxNjA1MTQ5MDc2Mjk1NmUwODIyOTU4Li41YzA4YTE4MTdjYzQ5NWQ3Njg2MDJmNWQy YWE4YTlkOGVmMGYyMmQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRp by9nc3RyZWFtZXIvV2ViS2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9XZWJLaXRXZWJBdWRpb1NvdXJjZUdT dHJlYW1lci5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJBdWRpb0lPQ2FsbGJhY2su aCIKICNpbmNsdWRlICJHUmVmUHRyR1N0cmVhbWVyLmgiCiAjaW5jbHVkZSAiR1N0cmVhbWVyVXRp bGl0aWVzLmgiCisjaW5jbHVkZSA8Z3N0L2FwcC9hcHAuaD4KICNpbmNsdWRlIDxnc3QvYXVkaW8v YXVkaW8uaD4KICNpbmNsdWRlIDxnc3QvcGJ1dGlscy9wYnV0aWxzLmg+CiAjaW5jbHVkZSA8d3Rm L2dvYmplY3QvR1VuaXF1ZVB0ci5oPgpAQCAtNTIsMTcgKzUzLDE2IEBAIHN0cnVjdCBfV2ViS2l0 V2ViQXVkaW9Tb3VyY2VQcml2YXRlIHsKICAgICBBdWRpb0J1cyogYnVzOwogICAgIEF1ZGlvSU9D YWxsYmFjayogcHJvdmlkZXI7CiAgICAgZ3VpbnQgZnJhbWVzVG9QdWxsOworICAgIGd1aW50IGJ1 ZmZlclNpemU7CiAKICAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IGludGVybGVhdmU7CiAKICAgICBH UmVmUHRyPEdzdFRhc2s+IHRhc2s7CiAgICAgR1JlY011dGV4IG11dGV4OwogCi0gICAgR1NMaXN0 KiBwYWRzOyAvLyBMaXN0IG9mIHF1ZXVlIHNpbmsgcGFkcy4gT25lIHF1ZXVlIGZvciBlYWNoIHBs YW5hciBhdWRpbyBjaGFubmVsLgorICAgIEdTTGlzdCogc291cmNlczsgLy8gTGlzdCBvZiBhcHBz cmMuIE9uZSBhcHBzcmMgZm9yIGVhY2ggcGxhbmFyIGF1ZGlvIGNoYW5uZWwuCiAgICAgR3N0UGFk KiBzb3VyY2VQYWQ7IC8vIHNyYyBwYWQgb2YgdGhlIGVsZW1lbnQsIGludGVybGVhdmVkIHdhdiBk YXRhIGlzIHB1c2hlZCB0byBpdC4KIAotICAgIGJvb2wgbmV3U3RyZWFtRXZlbnRQZW5kaW5nOwot ICAgIEdzdFNlZ21lbnQgc2VnbWVudDsKICAgICBndWludDY0IG51bWJlck9mU2FtcGxlczsKIAog ICAgIEdzdEJ1ZmZlclBvb2wqIHBvb2w7CkBAIC0xOTIsOSArMTkyLDYgQEAgc3RhdGljIHZvaWQg d2Via2l0X3dlYl9hdWRpb19zcmNfaW5pdChXZWJLaXRXZWJBdWRpb1NyYyogc3JjKQogICAgIHBy aXYtPnByb3ZpZGVyID0gMDsKICAgICBwcml2LT5idXMgPSAwOwogCi0gICAgcHJpdi0+bmV3U3Ry ZWFtRXZlbnRQZW5kaW5nID0gdHJ1ZTsKLSAgICBnc3Rfc2VnbWVudF9pbml0KCZwcml2LT5zZWdt ZW50LCBHU1RfRk9STUFUX1RJTUUpOwotCiAgICAgZ19yZWNfbXV0ZXhfaW5pdCgmcHJpdi0+bXV0 ZXgpOwogICAgIHByaXYtPnRhc2sgPSBnc3RfdGFza19uZXcocmVpbnRlcnByZXRfY2FzdDxHc3RU YXNrRnVuY3Rpb24+KHdlYktpdFdlYkF1ZGlvU3JjTG9vcCksIHNyYywgMCk7CiAKQEAgLTIxMCw3 ICsyMDcsNyBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJBdWRpb1NyY0NvbnN0cnVjdGVkKEdPYmpl Y3QqIG9iamVjdCkKICAgICBBU1NFUlQocHJpdi0+cHJvdmlkZXIpOwogICAgIEFTU0VSVChwcml2 LT5zYW1wbGVSYXRlKTsKIAotICAgIHByaXYtPmludGVybGVhdmUgPSBnc3RfZWxlbWVudF9mYWN0 b3J5X21ha2UoImludGVybGVhdmUiLCAwKTsKKyAgICBwcml2LT5pbnRlcmxlYXZlID0gZ3N0X2Vs ZW1lbnRfZmFjdG9yeV9tYWtlKCJpbnRlcmxlYXZlIiwgbnVsbHB0cik7CiAKICAgICBpZiAoIXBy aXYtPmludGVybGVhdmUpIHsKICAgICAgICAgR1NUX0VSUk9SX09CSkVDVChzcmMsICJGYWlsZWQg dG8gY3JlYXRlIGludGVybGVhdmUiKTsKQEAgLTIyMCwzNCArMjE3LDI5IEBAIHN0YXRpYyB2b2lk IHdlYktpdFdlYkF1ZGlvU3JjQ29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQogICAgIGdzdF9i aW5fYWRkKEdTVF9CSU4oc3JjKSwgcHJpdi0+aW50ZXJsZWF2ZS5nZXQoKSk7CiAKICAgICAvLyBG b3IgZWFjaCBjaGFubmVsIG9mIHRoZSBidXMgY3JlYXRlIGEgbmV3IHVwc3RyZWFtIGJyYW5jaCBm b3IgaW50ZXJsZWF2ZSwgbGlrZToKLSAgICAvLyBxdWV1ZSAhIGNhcHNmaWx0ZXIuIHdoaWNoIGlz IHBsdWdnZWQgdG8gYSBuZXcgaW50ZXJsZWF2ZSByZXF1ZXN0IHNpbmtwYWQuCisgICAgLy8gYXBw c3JjICEgLiB3aGljaCBpcyBwbHVnZ2VkIHRvIGEgbmV3IGludGVybGVhdmUgcmVxdWVzdCBzaW5r cGFkLgogICAgIGZvciAodW5zaWduZWQgY2hhbm5lbEluZGV4ID0gMDsgY2hhbm5lbEluZGV4IDwg cHJpdi0+YnVzLT5udW1iZXJPZkNoYW5uZWxzKCk7IGNoYW5uZWxJbmRleCsrKSB7Ci0gICAgICAg IEdVbmlxdWVQdHI8Z2NoYXI+IHF1ZXVlTmFtZShnX3N0cmR1cF9wcmludGYoIndlYmF1ZGlvUXVl dWUldSIsIGNoYW5uZWxJbmRleCkpOwotICAgICAgICBHc3RFbGVtZW50KiBxdWV1ZSA9IGdzdF9l bGVtZW50X2ZhY3RvcnlfbWFrZSgicXVldWUiLCBxdWV1ZU5hbWUuZ2V0KCkpOwotICAgICAgICBH c3RFbGVtZW50KiBjYXBzZmlsdGVyID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJjYXBzZmls dGVyIiwgMCk7Ci0KKyAgICAgICAgR1VuaXF1ZVB0cjxnY2hhcj4gYXBwc3JjTmFtZShnX3N0cmR1 cF9wcmludGYoIndlYmF1ZGlvU3JjJXUiLCBjaGFubmVsSW5kZXgpKTsKKyAgICAgICAgR3N0RWxl bWVudCogYXBwc3JjID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJhcHBzcmMiLCBhcHBzcmNO YW1lLmdldCgpKTsKICAgICAgICAgR1JlZlB0cjxHc3RDYXBzPiBtb25vQ2FwcyA9IGFkb3B0R1Jl ZihnZXRHU3RyZWFtZXJNb25vQXVkaW9DYXBzKHByaXYtPnNhbXBsZVJhdGUpKTsKIAogICAgICAg ICBHc3RBdWRpb0luZm8gaW5mbzsKICAgICAgICAgZ3N0X2F1ZGlvX2luZm9fZnJvbV9jYXBzKCZp bmZvLCBtb25vQ2Fwcy5nZXQoKSk7CiAgICAgICAgIEdTVF9BVURJT19JTkZPX1BPU0lUSU9OKCZp bmZvLCAwKSA9IHdlYktpdFdlYkF1ZGlvR1N0cmVhbWVyQ2hhbm5lbFBvc2l0aW9uKGNoYW5uZWxJ bmRleCk7CiAgICAgICAgIEdSZWZQdHI8R3N0Q2Fwcz4gY2FwcyA9IGFkb3B0R1JlZihnc3RfYXVk aW9faW5mb190b19jYXBzKCZpbmZvKSk7Ci0gICAgICAgIGdfb2JqZWN0X3NldChjYXBzZmlsdGVy LCAiY2FwcyIsIGNhcHMuZ2V0KCksIE5VTEwpOwogCi0gICAgICAgIC8vIENvbmZpZ3VyZSB0aGUg cXVldWUgZm9yIG1pbmltYWwgbGF0ZW5jeS4KLSAgICAgICAgZ19vYmplY3Rfc2V0KHF1ZXVlLCAi bWF4LXNpemUtYnVmZmVycyIsIHN0YXRpY19jYXN0PGd1aW50PigxKSwgTlVMTCk7CisgICAgICAg IC8vIENvbmZpZ3VyZSB0aGUgYXBwc3JjIGZvciBtaW5pbWFsIGxhdGVuY3kuCisgICAgICAgIGdf b2JqZWN0X3NldChhcHBzcmMsICJtYXgtYnl0ZXMiLCAyICogcHJpdi0+YnVmZmVyU2l6ZSwgImJs b2NrIiwgVFJVRSwKKyAgICAgICAgICAgICJmb3JtYXQiLCBHU1RfRk9STUFUX1RJTUUsICJjYXBz IiwgY2Fwcy5nZXQoKSwgbnVsbHB0cik7CiAKLSAgICAgICAgR3N0UGFkKiBwYWQgPSBnc3RfZWxl bWVudF9nZXRfc3RhdGljX3BhZChxdWV1ZSwgInNpbmsiKTsKLSAgICAgICAgcHJpdi0+cGFkcyA9 IGdfc2xpc3RfcHJlcGVuZChwcml2LT5wYWRzLCBwYWQpOwotCi0gICAgICAgIGdzdF9iaW5fYWRk X21hbnkoR1NUX0JJTihzcmMpLCBxdWV1ZSwgY2Fwc2ZpbHRlciwgTlVMTCk7Ci0gICAgICAgIGdz dF9lbGVtZW50X2xpbmtfcGFkc19mdWxsKHF1ZXVlLCAic3JjIiwgY2Fwc2ZpbHRlciwgInNpbmsi LCBHU1RfUEFEX0xJTktfQ0hFQ0tfTk9USElORyk7Ci0gICAgICAgIGdzdF9lbGVtZW50X2xpbmtf cGFkc19mdWxsKGNhcHNmaWx0ZXIsICJzcmMiLCBwcml2LT5pbnRlcmxlYXZlLmdldCgpLCAic2lu a18ldSIsIEdTVF9QQURfTElOS19DSEVDS19OT1RISU5HKTsKKyAgICAgICAgcHJpdi0+c291cmNl cyA9IGdfc2xpc3RfcHJlcGVuZChwcml2LT5zb3VyY2VzLCBnc3Rfb2JqZWN0X3JlZihhcHBzcmMp KTsKIAorICAgICAgICBnc3RfYmluX2FkZChHU1RfQklOKHNyYyksIGFwcHNyYyk7CisgICAgICAg IGdzdF9lbGVtZW50X2xpbmtfcGFkc19mdWxsKGFwcHNyYywgInNyYyIsIHByaXYtPmludGVybGVh dmUuZ2V0KCksICJzaW5rXyV1IiwgR1NUX1BBRF9MSU5LX0NIRUNLX05PVEhJTkcpOwogICAgIH0K LSAgICBwcml2LT5wYWRzID0gZ19zbGlzdF9yZXZlcnNlKHByaXYtPnBhZHMpOworICAgIHByaXYt PnNvdXJjZXMgPSBnX3NsaXN0X3JldmVyc2UocHJpdi0+c291cmNlcyk7CiAKLSAgICAvLyB3YXZl bmMncyBzcmMgcGFkIGlzIHRoZSBvbmx5IHZpc2libGUgcGFkIG9mIG91ciBlbGVtZW50LgorICAg IC8vIGludGVybGVhdmUncyBzcmMgcGFkIGlzIHRoZSBvbmx5IHZpc2libGUgcGFkIG9mIG91ciBl bGVtZW50LgogICAgIEdSZWZQdHI8R3N0UGFkPiB0YXJnZXRQYWQgPSBhZG9wdEdSZWYoZ3N0X2Vs ZW1lbnRfZ2V0X3N0YXRpY19wYWQocHJpdi0+aW50ZXJsZWF2ZS5nZXQoKSwgInNyYyIpKTsKICAg ICBnc3RfZ2hvc3RfcGFkX3NldF90YXJnZXQoR1NUX0dIT1NUX1BBRChwcml2LT5zb3VyY2VQYWQp LCB0YXJnZXRQYWQuZ2V0KCkpOwogfQpAQCAtMjU5LDcgKzI1MSw3IEBAIHN0YXRpYyB2b2lkIHdl YktpdFdlYkF1ZGlvU3JjRmluYWxpemUoR09iamVjdCogb2JqZWN0KQogCiAgICAgZ19yZWNfbXV0 ZXhfY2xlYXIoJnByaXYtPm11dGV4KTsKIAotICAgIGdfc2xpc3RfZnJlZV9mdWxsKHByaXYtPnBh ZHMsIHJlaW50ZXJwcmV0X2Nhc3Q8R0Rlc3Ryb3lOb3RpZnk+KGdzdF9vYmplY3RfdW5yZWYpKTsK KyAgICBnX3NsaXN0X2ZyZWVfZnVsbChwcml2LT5zb3VyY2VzLCByZWludGVycHJldF9jYXN0PEdE ZXN0cm95Tm90aWZ5Pihnc3Rfb2JqZWN0X3VucmVmKSk7CiAKICAgICBwcml2LT5+V2ViS2l0V2Vi QXVkaW9Tb3VyY2VQcml2YXRlKCk7CiAgICAgR1NUX0NBTExfUEFSRU5UKEdfT0JKRUNUX0NMQVNT LCBmaW5hbGl6ZSwgKChHT2JqZWN0KiApKHNyYykpKTsKQEAgLTI4Miw2ICsyNzQsNyBAQCBzdGF0 aWMgdm9pZCB3ZWJLaXRXZWJBdWRpb1NyY1NldFByb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3Vp bnQgcHJvcGVydHlJZCwgY29ucwogICAgICAgICBicmVhazsKICAgICBjYXNlIFBST1BfRlJBTUVT OgogICAgICAgICBwcml2LT5mcmFtZXNUb1B1bGwgPSBnX3ZhbHVlX2dldF91aW50KHZhbHVlKTsK KyAgICAgICAgcHJpdi0+YnVmZmVyU2l6ZSA9IHNpemVvZihmbG9hdCkgKiBwcml2LT5mcmFtZXNU b1B1bGw7CiAgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dB Uk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BlcnR5SWQsIHBzcGVjKTsKQEAgLTMz MSw3ICszMjQsNyBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJBdWRpb1NyY0xvb3AoV2ViS2l0V2Vi QXVkaW9TcmMqIHNyYykKIAogICAgIEdTTGlzdCogY2hhbm5lbEJ1ZmZlckxpc3QgPSAwOwogICAg IHJlZ2lzdGVyIGludCBpOwotICAgIGZvciAoaSA9IGdfc2xpc3RfbGVuZ3RoKHByaXYtPnBhZHMp IC0gMTsgaSA+PSAwOyBpLS0pIHsKKyAgICBmb3IgKGkgPSBnX3NsaXN0X2xlbmd0aChwcml2LT5z b3VyY2VzKSAtIDE7IGkgPj0gMDsgaS0tKSB7CiAgICAgICAgIEF1ZGlvU3JjQnVmZmVyKiBidWZm ZXIgPSBnX25ldyhBdWRpb1NyY0J1ZmZlciwgMSk7CiAgICAgICAgIEdzdEJ1ZmZlciogY2hhbm5l bEJ1ZmZlcjsKIApAQCAtMzYzLDE3ICszNTYsMTEgQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViQXVk aW9TcmNMb29wKFdlYktpdFdlYkF1ZGlvU3JjKiBzcmMpCiAgICAgLy8gRklYTUU6IEFkZCBzdXBw b3J0IGZvciBsb2NhbC9saXZlIGF1ZGlvIGlucHV0LgogICAgIHByaXYtPnByb3ZpZGVyLT5yZW5k ZXIoMCwgcHJpdi0+YnVzLCBwcml2LT5mcmFtZXNUb1B1bGwpOwogCi0gICAgR1NMaXN0KiBwYWRz SXQgPSBwcml2LT5wYWRzOworICAgIEdTTGlzdCogc291cmNlc0l0ID0gcHJpdi0+c291cmNlczsK ICAgICBHU0xpc3QqIGJ1ZmZlcnNJdCA9IGNoYW5uZWxCdWZmZXJMaXN0OwogCi0jaWYgR1NUX0NI RUNLX1ZFUlNJT04oMSwgMiwgMCkKLSAgICBndWludCBncm91cElkID0gMDsKLSAgICBpZiAocHJp di0+bmV3U3RyZWFtRXZlbnRQZW5kaW5nKQotICAgICAgICBncm91cElkID0gZ3N0X3V0aWxfZ3Jv dXBfaWRfbmV4dCgpOwotI2VuZGlmCi0KLSAgICBmb3IgKGkgPSAwOyBwYWRzSXQgJiYgYnVmZmVy c0l0OyBwYWRzSXQgPSBnX3NsaXN0X25leHQocGFkc0l0KSwgYnVmZmVyc0l0ID0gZ19zbGlzdF9u ZXh0KGJ1ZmZlcnNJdCksICsraSkgewotICAgICAgICBHc3RQYWQqIHBhZCA9IHN0YXRpY19jYXN0 PEdzdFBhZCo+KHBhZHNJdC0+ZGF0YSk7CisgICAgZm9yIChpID0gMDsgc291cmNlc0l0ICYmIGJ1 ZmZlcnNJdDsgc291cmNlc0l0ID0gZ19zbGlzdF9uZXh0KHNvdXJjZXNJdCksIGJ1ZmZlcnNJdCA9 IGdfc2xpc3RfbmV4dChidWZmZXJzSXQpLCArK2kpIHsKKyAgICAgICAgR3N0RWxlbWVudCogYXBw c3JjID0gc3RhdGljX2Nhc3Q8R3N0RWxlbWVudCo+KHNvdXJjZXNJdC0+ZGF0YSk7CiAgICAgICAg IEF1ZGlvU3JjQnVmZmVyKiBidWZmZXIgPSBzdGF0aWNfY2FzdDxBdWRpb1NyY0J1ZmZlcio+KGJ1 ZmZlcnNJdC0+ZGF0YSk7CiAgICAgICAgIEdzdEJ1ZmZlciogY2hhbm5lbEJ1ZmZlciA9IGJ1ZmZl ci0+YnVmZmVyOwogCkBAIC0zODEsMzcgKzM2OCwxMyBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJB dWRpb1NyY0xvb3AoV2ViS2l0V2ViQXVkaW9TcmMqIHNyYykKICAgICAgICAgZ3N0X2J1ZmZlcl91 bm1hcChjaGFubmVsQnVmZmVyLCAmYnVmZmVyLT5pbmZvKTsKICAgICAgICAgZ19mcmVlKGJ1ZmZl cik7CiAKLSAgICAgICAgLy8gU2VuZCBzdHJlYW0tc3RhcnQsIHNlZ21lbnQgYW5kIGNhcHMgZXZl bnRzIGRvd25zdHJlYW0sIGFsb25nIHdpdGggdGhlIGZpcnN0IGJ1ZmZlci4KLSAgICAgICAgaWYg KHByaXYtPm5ld1N0cmVhbUV2ZW50UGVuZGluZykgewotICAgICAgICAgICAgR1JlZlB0cjxHc3RF bGVtZW50PiBxdWV1ZSA9IGFkb3B0R1JlZihnc3RfcGFkX2dldF9wYXJlbnRfZWxlbWVudChwYWQp KTsKLSAgICAgICAgICAgIEdSZWZQdHI8R3N0UGFkPiBzaW5rUGFkID0gYWRvcHRHUmVmKGdzdF9l bGVtZW50X2dldF9zdGF0aWNfcGFkKHF1ZXVlLmdldCgpLCAic2luayIpKTsKLSAgICAgICAgICAg IEdVbmlxdWVQdHI8Z2NoYXI+IHF1ZXVlTmFtZShnc3RfZWxlbWVudF9nZXRfbmFtZShxdWV1ZS5n ZXQoKSkpOwotICAgICAgICAgICAgR1VuaXF1ZVB0cjxnY2hhcj4gc3RyZWFtSWQoZ19zdHJkdXBf cHJpbnRmKCJ3ZWJhdWRpby8lcyIsIHF1ZXVlTmFtZS5nZXQoKSkpOwotICAgICAgICAgICAgR3N0 RXZlbnQqIHN0cmVhbVN0YXJ0RXZlbnQgPSBnc3RfZXZlbnRfbmV3X3N0cmVhbV9zdGFydChzdHJl YW1JZC5nZXQoKSk7Ci0jaWYgR1NUX0NIRUNLX1ZFUlNJT04oMSwgMiwgMCkKLSAgICAgICAgICAg IGdzdF9ldmVudF9zZXRfZ3JvdXBfaWQoc3RyZWFtU3RhcnRFdmVudCwgZ3JvdXBJZCk7Ci0jZW5k aWYKLSAgICAgICAgICAgIGdzdF9wYWRfc2VuZF9ldmVudChzaW5rUGFkLmdldCgpLCBzdHJlYW1T dGFydEV2ZW50KTsKLQotICAgICAgICAgICAgR1JlZlB0cjxHc3RDYXBzPiBtb25vQ2FwcyA9IGFk b3B0R1JlZihnZXRHU3RyZWFtZXJNb25vQXVkaW9DYXBzKHByaXYtPnNhbXBsZVJhdGUpKTsKLSAg ICAgICAgICAgIEdzdEF1ZGlvSW5mbyBpbmZvOwotICAgICAgICAgICAgZ3N0X2F1ZGlvX2luZm9f ZnJvbV9jYXBzKCZpbmZvLCBtb25vQ2Fwcy5nZXQoKSk7Ci0gICAgICAgICAgICBHU1RfQVVESU9f SU5GT19QT1NJVElPTigmaW5mbywgMCkgPSB3ZWJLaXRXZWJBdWRpb0dTdHJlYW1lckNoYW5uZWxQ b3NpdGlvbihpKTsKLSAgICAgICAgICAgIEdSZWZQdHI8R3N0Q2Fwcz4gY2Fwc1dpdGhDaGFubmVs UG9zaXRpb24gPSBhZG9wdEdSZWYoZ3N0X2F1ZGlvX2luZm9fdG9fY2FwcygmaW5mbykpOwotICAg ICAgICAgICAgZ3N0X3BhZF9zZW5kX2V2ZW50KHNpbmtQYWQuZ2V0KCksIGdzdF9ldmVudF9uZXdf Y2FwcyhjYXBzV2l0aENoYW5uZWxQb3NpdGlvbi5nZXQoKSkpOwotCi0gICAgICAgICAgICBnc3Rf cGFkX3NlbmRfZXZlbnQoc2lua1BhZC5nZXQoKSwgZ3N0X2V2ZW50X25ld19zZWdtZW50KCZwcml2 LT5zZWdtZW50KSk7Ci0gICAgICAgIH0KLQotICAgICAgICBHc3RGbG93UmV0dXJuIHJldCA9IGdz dF9wYWRfY2hhaW4ocGFkLCBjaGFubmVsQnVmZmVyKTsKKyAgICAgICAgR3N0Rmxvd1JldHVybiBy ZXQgPSBnc3RfYXBwX3NyY19wdXNoX2J1ZmZlcihHU1RfQVBQX1NSQyhhcHBzcmMpLCBjaGFubmVs QnVmZmVyKTsKICAgICAgICAgaWYgKHJldCAhPSBHU1RfRkxPV19PSykgewotICAgICAgICAgICAg R1NUX0VMRU1FTlRfRVJST1Ioc3JjLCBDT1JFLCBQQUQsICgiSW50ZXJuYWwgV2ViQXVkaW9TcmMg ZXJyb3IiKSwgKCJGYWlsZWQgdG8gcHVzaCBidWZmZXIgb24gJXM6JXMgZmxvdzogJXMiLCBHU1Rf REVCVUdfUEFEX05BTUUocGFkKSwgZ3N0X2Zsb3dfZ2V0X25hbWUocmV0KSkpOworICAgICAgICAg ICAgR1NUX0VMRU1FTlRfRVJST1Ioc3JjLCBDT1JFLCBQQUQsICgiSW50ZXJuYWwgV2ViQXVkaW9T cmMgZXJyb3IiKSwgKCJGYWlsZWQgdG8gcHVzaCBidWZmZXIgb24gJXMgZmxvdzogJXMiLCBHU1Rf T0JKRUNUX05BTUUoYXBwc3JjKSwgZ3N0X2Zsb3dfZ2V0X25hbWUocmV0KSkpOwogICAgICAgICAg ICAgZ3N0X3Rhc2tfcGF1c2Uoc3JjLT5wcml2LT50YXNrLmdldCgpKTsKICAgICAgICAgfQogICAg IH0KIAotICAgIHByaXYtPm5ld1N0cmVhbUV2ZW50UGVuZGluZyA9IGZhbHNlOwotCiAgICAgZ19z bGlzdF9mcmVlKGNoYW5uZWxCdWZmZXJMaXN0KTsKIH0KIApAQCAtNDQ0LDcgKzQwNyw3IEBAIHN0 YXRpYyBHc3RTdGF0ZUNoYW5nZVJldHVybiB3ZWJLaXRXZWJBdWRpb1NyY0NoYW5nZVN0YXRlKEdz dEVsZW1lbnQqIGVsZW1lbnQsIEdzCiAgICAgICAgIEdTVF9ERUJVR19PQkpFQ1Qoc3JjLCAiUkVB RFktPlBBVVNFRCIpOwogICAgICAgICBzcmMtPnByaXYtPnBvb2wgPSBnc3RfYnVmZmVyX3Bvb2xf bmV3KCk7CiAgICAgICAgIEdzdFN0cnVjdHVyZSogY29uZmlnID0gZ3N0X2J1ZmZlcl9wb29sX2dl dF9jb25maWcoc3JjLT5wcml2LT5wb29sKTsKLSAgICAgICAgZ3N0X2J1ZmZlcl9wb29sX2NvbmZp Z19zZXRfcGFyYW1zKGNvbmZpZywgbnVsbHB0ciwgc3JjLT5wcml2LT5mcmFtZXNUb1B1bGwgKiBz aXplb2YoZmxvYXQpLCAwLCAwKTsKKyAgICAgICAgZ3N0X2J1ZmZlcl9wb29sX2NvbmZpZ19zZXRf cGFyYW1zKGNvbmZpZywgbnVsbHB0ciwgc3JjLT5wcml2LT5idWZmZXJTaXplLCAwLCAwKTsKICAg ICAgICAgZ3N0X2J1ZmZlcl9wb29sX3NldF9jb25maWcoc3JjLT5wcml2LT5wb29sLCBjb25maWcp OwogICAgICAgICBpZiAoIWdzdF9idWZmZXJfcG9vbF9zZXRfYWN0aXZlKHNyYy0+cHJpdi0+cG9v bCwgVFJVRSkpCiAgICAgICAgICAgICByZXR1cm5WYWx1ZSA9IEdTVF9TVEFURV9DSEFOR0VfRkFJ TFVSRTsKQEAgLTQ1Myw3ICs0MTYsNiBAQCBzdGF0aWMgR3N0U3RhdGVDaGFuZ2VSZXR1cm4gd2Vi S2l0V2ViQXVkaW9TcmNDaGFuZ2VTdGF0ZShHc3RFbGVtZW50KiBlbGVtZW50LCBHcwogICAgICAg ICBicmVhazsKICAgICB9CiAgICAgY2FzZSBHU1RfU1RBVEVfQ0hBTkdFX1BBVVNFRF9UT19SRUFE WToKLSAgICAgICAgc3JjLT5wcml2LT5uZXdTdHJlYW1FdmVudFBlbmRpbmcgPSB0cnVlOwogICAg ICAgICBHU1RfREVCVUdfT0JKRUNUKHNyYywgIlBBVVNFRC0+UkVBRFkiKTsKICAgICAgICAgaWYg KCFnc3RfdGFza19qb2luKHNyYy0+cHJpdi0+dGFzay5nZXQoKSkpCiAgICAgICAgICAgICByZXR1 cm5WYWx1ZSA9IEdTVF9TVEFURV9DSEFOR0VfRkFJTFVSRTsK 243049 2014-12-10 10:58:29 -0800 2014-12-10 11:42:23 -0800 Patch bug-139490-20141210195958.patch text/plain 11322 slomo U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmEwM2VkNWI3OTViMmQx MzMzMDQwYTUzYzhjNTU1MTUzM2FmZTkwNS4uNTI3ZmY0MWFmYzczNTMwNWNiZTViYjAwOWU2MzJi YjRlMzk2OTUwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE0LTEyLTEwICBTZWJh c3RpYW4gRHLDtmdlICA8c2ViYXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KIAorICAgICAgICBbR1N0 cmVhbWVyXSBVc2UgYXBwc3JjcyBpbnN0ZWFkIG9mIHVuY29ubmVjdGVkIHF1ZXVlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NDkwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRp by9nc3RyZWFtZXIvV2ViS2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIuY3BwOgorICAgICAgICAo d2Via2l0X3dlYl9hdWRpb19zcmNfaW5pdCk6CisgICAgICAgICh3ZWJLaXRXZWJBdWRpb1NyY0Nv bnN0cnVjdGVkKToKKyAgICAgICAgKHdlYktpdFdlYkF1ZGlvU3JjRmluYWxpemUpOgorICAgICAg ICAod2ViS2l0V2ViQXVkaW9TcmNTZXRQcm9wZXJ0eSk6CisgICAgICAgICh3ZWJLaXRXZWJBdWRp b1NyY0xvb3ApOgorICAgICAgICAod2ViS2l0V2ViQXVkaW9TcmNDaGFuZ2VTdGF0ZSk6CisgICAg ICAgIFByZXZpb3VzbHkgd2UgZGlyZWN0bHkgY2hhaW5lZCBidWZmZXJzIGludG8gdW5jb25uZWN0 ZWQgcXVldWVzLAorICAgICAgICB3aGljaCBjb25mdXNlZCBzb21lIGNvZGUgaW5zaWRlIEdTdHJl YW1lciBhbmQgY2F1c2VkIHNvbWUgaGFybWxlc3MKKyAgICAgICAgd2FybmluZ3MuIE5vdyB3ZSB1 c2UgYXBwc3JjcyBpbnN0ZWFkLCB3aGljaCBhbHNvIGFsbG93cyB1cyB0byByZW1vdmUKKyAgICAg ICAgcXVpdGUgc29tZSBjb2RlLgorCisyMDE0LTEyLTEwICBTZWJhc3RpYW4gRHLDtmdlICA8c2Vi YXN0aWFuQGNlbnRyaWN1bGFyLmNvbT4KKwogICAgICAgICBbR1N0cmVhbWVyXSBVc2UgYSBidWZm ZXIgcG9vbCBmb3IgYWxsb2NhdGlvbnMgaW4gdGhlIEF1ZGlvRGVzdGluYXRpb24KICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTQ4NwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIvV2ViS2l0V2ViQXVk aW9Tb3VyY2VHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vZ3N0 cmVhbWVyL1dlYktpdFdlYkF1ZGlvU291cmNlR1N0cmVhbWVyLmNwcAppbmRleCAyNTkzZTliNTM4 ZTFhOGM5OTYxNjA1MTQ5MDc2Mjk1NmUwODIyOTU4Li41YzA4YTE4MTdjYzQ5NWQ3Njg2MDJmNWQy YWE4YTlkOGVmMGYyMmQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRp by9nc3RyZWFtZXIvV2ViS2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9XZWJLaXRXZWJBdWRpb1NvdXJjZUdT dHJlYW1lci5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJBdWRpb0lPQ2FsbGJhY2su aCIKICNpbmNsdWRlICJHUmVmUHRyR1N0cmVhbWVyLmgiCiAjaW5jbHVkZSAiR1N0cmVhbWVyVXRp bGl0aWVzLmgiCisjaW5jbHVkZSA8Z3N0L2FwcC9hcHAuaD4KICNpbmNsdWRlIDxnc3QvYXVkaW8v YXVkaW8uaD4KICNpbmNsdWRlIDxnc3QvcGJ1dGlscy9wYnV0aWxzLmg+CiAjaW5jbHVkZSA8d3Rm L2dvYmplY3QvR1VuaXF1ZVB0ci5oPgpAQCAtNTIsMTcgKzUzLDE2IEBAIHN0cnVjdCBfV2ViS2l0 V2ViQXVkaW9Tb3VyY2VQcml2YXRlIHsKICAgICBBdWRpb0J1cyogYnVzOwogICAgIEF1ZGlvSU9D YWxsYmFjayogcHJvdmlkZXI7CiAgICAgZ3VpbnQgZnJhbWVzVG9QdWxsOworICAgIGd1aW50IGJ1 ZmZlclNpemU7CiAKICAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IGludGVybGVhdmU7CiAKICAgICBH UmVmUHRyPEdzdFRhc2s+IHRhc2s7CiAgICAgR1JlY011dGV4IG11dGV4OwogCi0gICAgR1NMaXN0 KiBwYWRzOyAvLyBMaXN0IG9mIHF1ZXVlIHNpbmsgcGFkcy4gT25lIHF1ZXVlIGZvciBlYWNoIHBs YW5hciBhdWRpbyBjaGFubmVsLgorICAgIEdTTGlzdCogc291cmNlczsgLy8gTGlzdCBvZiBhcHBz cmMuIE9uZSBhcHBzcmMgZm9yIGVhY2ggcGxhbmFyIGF1ZGlvIGNoYW5uZWwuCiAgICAgR3N0UGFk KiBzb3VyY2VQYWQ7IC8vIHNyYyBwYWQgb2YgdGhlIGVsZW1lbnQsIGludGVybGVhdmVkIHdhdiBk YXRhIGlzIHB1c2hlZCB0byBpdC4KIAotICAgIGJvb2wgbmV3U3RyZWFtRXZlbnRQZW5kaW5nOwot ICAgIEdzdFNlZ21lbnQgc2VnbWVudDsKICAgICBndWludDY0IG51bWJlck9mU2FtcGxlczsKIAog ICAgIEdzdEJ1ZmZlclBvb2wqIHBvb2w7CkBAIC0xOTIsOSArMTkyLDYgQEAgc3RhdGljIHZvaWQg d2Via2l0X3dlYl9hdWRpb19zcmNfaW5pdChXZWJLaXRXZWJBdWRpb1NyYyogc3JjKQogICAgIHBy aXYtPnByb3ZpZGVyID0gMDsKICAgICBwcml2LT5idXMgPSAwOwogCi0gICAgcHJpdi0+bmV3U3Ry ZWFtRXZlbnRQZW5kaW5nID0gdHJ1ZTsKLSAgICBnc3Rfc2VnbWVudF9pbml0KCZwcml2LT5zZWdt ZW50LCBHU1RfRk9STUFUX1RJTUUpOwotCiAgICAgZ19yZWNfbXV0ZXhfaW5pdCgmcHJpdi0+bXV0 ZXgpOwogICAgIHByaXYtPnRhc2sgPSBnc3RfdGFza19uZXcocmVpbnRlcnByZXRfY2FzdDxHc3RU YXNrRnVuY3Rpb24+KHdlYktpdFdlYkF1ZGlvU3JjTG9vcCksIHNyYywgMCk7CiAKQEAgLTIxMCw3 ICsyMDcsNyBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJBdWRpb1NyY0NvbnN0cnVjdGVkKEdPYmpl Y3QqIG9iamVjdCkKICAgICBBU1NFUlQocHJpdi0+cHJvdmlkZXIpOwogICAgIEFTU0VSVChwcml2 LT5zYW1wbGVSYXRlKTsKIAotICAgIHByaXYtPmludGVybGVhdmUgPSBnc3RfZWxlbWVudF9mYWN0 b3J5X21ha2UoImludGVybGVhdmUiLCAwKTsKKyAgICBwcml2LT5pbnRlcmxlYXZlID0gZ3N0X2Vs ZW1lbnRfZmFjdG9yeV9tYWtlKCJpbnRlcmxlYXZlIiwgbnVsbHB0cik7CiAKICAgICBpZiAoIXBy aXYtPmludGVybGVhdmUpIHsKICAgICAgICAgR1NUX0VSUk9SX09CSkVDVChzcmMsICJGYWlsZWQg dG8gY3JlYXRlIGludGVybGVhdmUiKTsKQEAgLTIyMCwzNCArMjE3LDI5IEBAIHN0YXRpYyB2b2lk IHdlYktpdFdlYkF1ZGlvU3JjQ29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQogICAgIGdzdF9i aW5fYWRkKEdTVF9CSU4oc3JjKSwgcHJpdi0+aW50ZXJsZWF2ZS5nZXQoKSk7CiAKICAgICAvLyBG b3IgZWFjaCBjaGFubmVsIG9mIHRoZSBidXMgY3JlYXRlIGEgbmV3IHVwc3RyZWFtIGJyYW5jaCBm b3IgaW50ZXJsZWF2ZSwgbGlrZToKLSAgICAvLyBxdWV1ZSAhIGNhcHNmaWx0ZXIuIHdoaWNoIGlz IHBsdWdnZWQgdG8gYSBuZXcgaW50ZXJsZWF2ZSByZXF1ZXN0IHNpbmtwYWQuCisgICAgLy8gYXBw c3JjICEgLiB3aGljaCBpcyBwbHVnZ2VkIHRvIGEgbmV3IGludGVybGVhdmUgcmVxdWVzdCBzaW5r cGFkLgogICAgIGZvciAodW5zaWduZWQgY2hhbm5lbEluZGV4ID0gMDsgY2hhbm5lbEluZGV4IDwg cHJpdi0+YnVzLT5udW1iZXJPZkNoYW5uZWxzKCk7IGNoYW5uZWxJbmRleCsrKSB7Ci0gICAgICAg IEdVbmlxdWVQdHI8Z2NoYXI+IHF1ZXVlTmFtZShnX3N0cmR1cF9wcmludGYoIndlYmF1ZGlvUXVl dWUldSIsIGNoYW5uZWxJbmRleCkpOwotICAgICAgICBHc3RFbGVtZW50KiBxdWV1ZSA9IGdzdF9l bGVtZW50X2ZhY3RvcnlfbWFrZSgicXVldWUiLCBxdWV1ZU5hbWUuZ2V0KCkpOwotICAgICAgICBH c3RFbGVtZW50KiBjYXBzZmlsdGVyID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJjYXBzZmls dGVyIiwgMCk7Ci0KKyAgICAgICAgR1VuaXF1ZVB0cjxnY2hhcj4gYXBwc3JjTmFtZShnX3N0cmR1 cF9wcmludGYoIndlYmF1ZGlvU3JjJXUiLCBjaGFubmVsSW5kZXgpKTsKKyAgICAgICAgR3N0RWxl bWVudCogYXBwc3JjID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJhcHBzcmMiLCBhcHBzcmNO YW1lLmdldCgpKTsKICAgICAgICAgR1JlZlB0cjxHc3RDYXBzPiBtb25vQ2FwcyA9IGFkb3B0R1Jl ZihnZXRHU3RyZWFtZXJNb25vQXVkaW9DYXBzKHByaXYtPnNhbXBsZVJhdGUpKTsKIAogICAgICAg ICBHc3RBdWRpb0luZm8gaW5mbzsKICAgICAgICAgZ3N0X2F1ZGlvX2luZm9fZnJvbV9jYXBzKCZp bmZvLCBtb25vQ2Fwcy5nZXQoKSk7CiAgICAgICAgIEdTVF9BVURJT19JTkZPX1BPU0lUSU9OKCZp bmZvLCAwKSA9IHdlYktpdFdlYkF1ZGlvR1N0cmVhbWVyQ2hhbm5lbFBvc2l0aW9uKGNoYW5uZWxJ bmRleCk7CiAgICAgICAgIEdSZWZQdHI8R3N0Q2Fwcz4gY2FwcyA9IGFkb3B0R1JlZihnc3RfYXVk aW9faW5mb190b19jYXBzKCZpbmZvKSk7Ci0gICAgICAgIGdfb2JqZWN0X3NldChjYXBzZmlsdGVy LCAiY2FwcyIsIGNhcHMuZ2V0KCksIE5VTEwpOwogCi0gICAgICAgIC8vIENvbmZpZ3VyZSB0aGUg cXVldWUgZm9yIG1pbmltYWwgbGF0ZW5jeS4KLSAgICAgICAgZ19vYmplY3Rfc2V0KHF1ZXVlLCAi bWF4LXNpemUtYnVmZmVycyIsIHN0YXRpY19jYXN0PGd1aW50PigxKSwgTlVMTCk7CisgICAgICAg IC8vIENvbmZpZ3VyZSB0aGUgYXBwc3JjIGZvciBtaW5pbWFsIGxhdGVuY3kuCisgICAgICAgIGdf b2JqZWN0X3NldChhcHBzcmMsICJtYXgtYnl0ZXMiLCAyICogcHJpdi0+YnVmZmVyU2l6ZSwgImJs b2NrIiwgVFJVRSwKKyAgICAgICAgICAgICJmb3JtYXQiLCBHU1RfRk9STUFUX1RJTUUsICJjYXBz IiwgY2Fwcy5nZXQoKSwgbnVsbHB0cik7CiAKLSAgICAgICAgR3N0UGFkKiBwYWQgPSBnc3RfZWxl bWVudF9nZXRfc3RhdGljX3BhZChxdWV1ZSwgInNpbmsiKTsKLSAgICAgICAgcHJpdi0+cGFkcyA9 IGdfc2xpc3RfcHJlcGVuZChwcml2LT5wYWRzLCBwYWQpOwotCi0gICAgICAgIGdzdF9iaW5fYWRk X21hbnkoR1NUX0JJTihzcmMpLCBxdWV1ZSwgY2Fwc2ZpbHRlciwgTlVMTCk7Ci0gICAgICAgIGdz dF9lbGVtZW50X2xpbmtfcGFkc19mdWxsKHF1ZXVlLCAic3JjIiwgY2Fwc2ZpbHRlciwgInNpbmsi LCBHU1RfUEFEX0xJTktfQ0hFQ0tfTk9USElORyk7Ci0gICAgICAgIGdzdF9lbGVtZW50X2xpbmtf cGFkc19mdWxsKGNhcHNmaWx0ZXIsICJzcmMiLCBwcml2LT5pbnRlcmxlYXZlLmdldCgpLCAic2lu a18ldSIsIEdTVF9QQURfTElOS19DSEVDS19OT1RISU5HKTsKKyAgICAgICAgcHJpdi0+c291cmNl cyA9IGdfc2xpc3RfcHJlcGVuZChwcml2LT5zb3VyY2VzLCBnc3Rfb2JqZWN0X3JlZihhcHBzcmMp KTsKIAorICAgICAgICBnc3RfYmluX2FkZChHU1RfQklOKHNyYyksIGFwcHNyYyk7CisgICAgICAg IGdzdF9lbGVtZW50X2xpbmtfcGFkc19mdWxsKGFwcHNyYywgInNyYyIsIHByaXYtPmludGVybGVh dmUuZ2V0KCksICJzaW5rXyV1IiwgR1NUX1BBRF9MSU5LX0NIRUNLX05PVEhJTkcpOwogICAgIH0K LSAgICBwcml2LT5wYWRzID0gZ19zbGlzdF9yZXZlcnNlKHByaXYtPnBhZHMpOworICAgIHByaXYt PnNvdXJjZXMgPSBnX3NsaXN0X3JldmVyc2UocHJpdi0+c291cmNlcyk7CiAKLSAgICAvLyB3YXZl bmMncyBzcmMgcGFkIGlzIHRoZSBvbmx5IHZpc2libGUgcGFkIG9mIG91ciBlbGVtZW50LgorICAg IC8vIGludGVybGVhdmUncyBzcmMgcGFkIGlzIHRoZSBvbmx5IHZpc2libGUgcGFkIG9mIG91ciBl bGVtZW50LgogICAgIEdSZWZQdHI8R3N0UGFkPiB0YXJnZXRQYWQgPSBhZG9wdEdSZWYoZ3N0X2Vs ZW1lbnRfZ2V0X3N0YXRpY19wYWQocHJpdi0+aW50ZXJsZWF2ZS5nZXQoKSwgInNyYyIpKTsKICAg ICBnc3RfZ2hvc3RfcGFkX3NldF90YXJnZXQoR1NUX0dIT1NUX1BBRChwcml2LT5zb3VyY2VQYWQp LCB0YXJnZXRQYWQuZ2V0KCkpOwogfQpAQCAtMjU5LDcgKzI1MSw3IEBAIHN0YXRpYyB2b2lkIHdl YktpdFdlYkF1ZGlvU3JjRmluYWxpemUoR09iamVjdCogb2JqZWN0KQogCiAgICAgZ19yZWNfbXV0 ZXhfY2xlYXIoJnByaXYtPm11dGV4KTsKIAotICAgIGdfc2xpc3RfZnJlZV9mdWxsKHByaXYtPnBh ZHMsIHJlaW50ZXJwcmV0X2Nhc3Q8R0Rlc3Ryb3lOb3RpZnk+KGdzdF9vYmplY3RfdW5yZWYpKTsK KyAgICBnX3NsaXN0X2ZyZWVfZnVsbChwcml2LT5zb3VyY2VzLCByZWludGVycHJldF9jYXN0PEdE ZXN0cm95Tm90aWZ5Pihnc3Rfb2JqZWN0X3VucmVmKSk7CiAKICAgICBwcml2LT5+V2ViS2l0V2Vi QXVkaW9Tb3VyY2VQcml2YXRlKCk7CiAgICAgR1NUX0NBTExfUEFSRU5UKEdfT0JKRUNUX0NMQVNT LCBmaW5hbGl6ZSwgKChHT2JqZWN0KiApKHNyYykpKTsKQEAgLTI4Miw2ICsyNzQsNyBAQCBzdGF0 aWMgdm9pZCB3ZWJLaXRXZWJBdWRpb1NyY1NldFByb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3Vp bnQgcHJvcGVydHlJZCwgY29ucwogICAgICAgICBicmVhazsKICAgICBjYXNlIFBST1BfRlJBTUVT OgogICAgICAgICBwcml2LT5mcmFtZXNUb1B1bGwgPSBnX3ZhbHVlX2dldF91aW50KHZhbHVlKTsK KyAgICAgICAgcHJpdi0+YnVmZmVyU2l6ZSA9IHNpemVvZihmbG9hdCkgKiBwcml2LT5mcmFtZXNU b1B1bGw7CiAgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dB Uk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BlcnR5SWQsIHBzcGVjKTsKQEAgLTMz MSw3ICszMjQsNyBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJBdWRpb1NyY0xvb3AoV2ViS2l0V2Vi QXVkaW9TcmMqIHNyYykKIAogICAgIEdTTGlzdCogY2hhbm5lbEJ1ZmZlckxpc3QgPSAwOwogICAg IHJlZ2lzdGVyIGludCBpOwotICAgIGZvciAoaSA9IGdfc2xpc3RfbGVuZ3RoKHByaXYtPnBhZHMp IC0gMTsgaSA+PSAwOyBpLS0pIHsKKyAgICBmb3IgKGkgPSBnX3NsaXN0X2xlbmd0aChwcml2LT5z b3VyY2VzKSAtIDE7IGkgPj0gMDsgaS0tKSB7CiAgICAgICAgIEF1ZGlvU3JjQnVmZmVyKiBidWZm ZXIgPSBnX25ldyhBdWRpb1NyY0J1ZmZlciwgMSk7CiAgICAgICAgIEdzdEJ1ZmZlciogY2hhbm5l bEJ1ZmZlcjsKIApAQCAtMzYzLDE3ICszNTYsMTEgQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViQXVk aW9TcmNMb29wKFdlYktpdFdlYkF1ZGlvU3JjKiBzcmMpCiAgICAgLy8gRklYTUU6IEFkZCBzdXBw b3J0IGZvciBsb2NhbC9saXZlIGF1ZGlvIGlucHV0LgogICAgIHByaXYtPnByb3ZpZGVyLT5yZW5k ZXIoMCwgcHJpdi0+YnVzLCBwcml2LT5mcmFtZXNUb1B1bGwpOwogCi0gICAgR1NMaXN0KiBwYWRz SXQgPSBwcml2LT5wYWRzOworICAgIEdTTGlzdCogc291cmNlc0l0ID0gcHJpdi0+c291cmNlczsK ICAgICBHU0xpc3QqIGJ1ZmZlcnNJdCA9IGNoYW5uZWxCdWZmZXJMaXN0OwogCi0jaWYgR1NUX0NI RUNLX1ZFUlNJT04oMSwgMiwgMCkKLSAgICBndWludCBncm91cElkID0gMDsKLSAgICBpZiAocHJp di0+bmV3U3RyZWFtRXZlbnRQZW5kaW5nKQotICAgICAgICBncm91cElkID0gZ3N0X3V0aWxfZ3Jv dXBfaWRfbmV4dCgpOwotI2VuZGlmCi0KLSAgICBmb3IgKGkgPSAwOyBwYWRzSXQgJiYgYnVmZmVy c0l0OyBwYWRzSXQgPSBnX3NsaXN0X25leHQocGFkc0l0KSwgYnVmZmVyc0l0ID0gZ19zbGlzdF9u ZXh0KGJ1ZmZlcnNJdCksICsraSkgewotICAgICAgICBHc3RQYWQqIHBhZCA9IHN0YXRpY19jYXN0 PEdzdFBhZCo+KHBhZHNJdC0+ZGF0YSk7CisgICAgZm9yIChpID0gMDsgc291cmNlc0l0ICYmIGJ1 ZmZlcnNJdDsgc291cmNlc0l0ID0gZ19zbGlzdF9uZXh0KHNvdXJjZXNJdCksIGJ1ZmZlcnNJdCA9 IGdfc2xpc3RfbmV4dChidWZmZXJzSXQpLCArK2kpIHsKKyAgICAgICAgR3N0RWxlbWVudCogYXBw c3JjID0gc3RhdGljX2Nhc3Q8R3N0RWxlbWVudCo+KHNvdXJjZXNJdC0+ZGF0YSk7CiAgICAgICAg IEF1ZGlvU3JjQnVmZmVyKiBidWZmZXIgPSBzdGF0aWNfY2FzdDxBdWRpb1NyY0J1ZmZlcio+KGJ1 ZmZlcnNJdC0+ZGF0YSk7CiAgICAgICAgIEdzdEJ1ZmZlciogY2hhbm5lbEJ1ZmZlciA9IGJ1ZmZl ci0+YnVmZmVyOwogCkBAIC0zODEsMzcgKzM2OCwxMyBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJB dWRpb1NyY0xvb3AoV2ViS2l0V2ViQXVkaW9TcmMqIHNyYykKICAgICAgICAgZ3N0X2J1ZmZlcl91 bm1hcChjaGFubmVsQnVmZmVyLCAmYnVmZmVyLT5pbmZvKTsKICAgICAgICAgZ19mcmVlKGJ1ZmZl cik7CiAKLSAgICAgICAgLy8gU2VuZCBzdHJlYW0tc3RhcnQsIHNlZ21lbnQgYW5kIGNhcHMgZXZl bnRzIGRvd25zdHJlYW0sIGFsb25nIHdpdGggdGhlIGZpcnN0IGJ1ZmZlci4KLSAgICAgICAgaWYg KHByaXYtPm5ld1N0cmVhbUV2ZW50UGVuZGluZykgewotICAgICAgICAgICAgR1JlZlB0cjxHc3RF bGVtZW50PiBxdWV1ZSA9IGFkb3B0R1JlZihnc3RfcGFkX2dldF9wYXJlbnRfZWxlbWVudChwYWQp KTsKLSAgICAgICAgICAgIEdSZWZQdHI8R3N0UGFkPiBzaW5rUGFkID0gYWRvcHRHUmVmKGdzdF9l bGVtZW50X2dldF9zdGF0aWNfcGFkKHF1ZXVlLmdldCgpLCAic2luayIpKTsKLSAgICAgICAgICAg IEdVbmlxdWVQdHI8Z2NoYXI+IHF1ZXVlTmFtZShnc3RfZWxlbWVudF9nZXRfbmFtZShxdWV1ZS5n ZXQoKSkpOwotICAgICAgICAgICAgR1VuaXF1ZVB0cjxnY2hhcj4gc3RyZWFtSWQoZ19zdHJkdXBf cHJpbnRmKCJ3ZWJhdWRpby8lcyIsIHF1ZXVlTmFtZS5nZXQoKSkpOwotICAgICAgICAgICAgR3N0 RXZlbnQqIHN0cmVhbVN0YXJ0RXZlbnQgPSBnc3RfZXZlbnRfbmV3X3N0cmVhbV9zdGFydChzdHJl YW1JZC5nZXQoKSk7Ci0jaWYgR1NUX0NIRUNLX1ZFUlNJT04oMSwgMiwgMCkKLSAgICAgICAgICAg IGdzdF9ldmVudF9zZXRfZ3JvdXBfaWQoc3RyZWFtU3RhcnRFdmVudCwgZ3JvdXBJZCk7Ci0jZW5k aWYKLSAgICAgICAgICAgIGdzdF9wYWRfc2VuZF9ldmVudChzaW5rUGFkLmdldCgpLCBzdHJlYW1T dGFydEV2ZW50KTsKLQotICAgICAgICAgICAgR1JlZlB0cjxHc3RDYXBzPiBtb25vQ2FwcyA9IGFk b3B0R1JlZihnZXRHU3RyZWFtZXJNb25vQXVkaW9DYXBzKHByaXYtPnNhbXBsZVJhdGUpKTsKLSAg ICAgICAgICAgIEdzdEF1ZGlvSW5mbyBpbmZvOwotICAgICAgICAgICAgZ3N0X2F1ZGlvX2luZm9f ZnJvbV9jYXBzKCZpbmZvLCBtb25vQ2Fwcy5nZXQoKSk7Ci0gICAgICAgICAgICBHU1RfQVVESU9f SU5GT19QT1NJVElPTigmaW5mbywgMCkgPSB3ZWJLaXRXZWJBdWRpb0dTdHJlYW1lckNoYW5uZWxQ b3NpdGlvbihpKTsKLSAgICAgICAgICAgIEdSZWZQdHI8R3N0Q2Fwcz4gY2Fwc1dpdGhDaGFubmVs UG9zaXRpb24gPSBhZG9wdEdSZWYoZ3N0X2F1ZGlvX2luZm9fdG9fY2FwcygmaW5mbykpOwotICAg ICAgICAgICAgZ3N0X3BhZF9zZW5kX2V2ZW50KHNpbmtQYWQuZ2V0KCksIGdzdF9ldmVudF9uZXdf Y2FwcyhjYXBzV2l0aENoYW5uZWxQb3NpdGlvbi5nZXQoKSkpOwotCi0gICAgICAgICAgICBnc3Rf cGFkX3NlbmRfZXZlbnQoc2lua1BhZC5nZXQoKSwgZ3N0X2V2ZW50X25ld19zZWdtZW50KCZwcml2 LT5zZWdtZW50KSk7Ci0gICAgICAgIH0KLQotICAgICAgICBHc3RGbG93UmV0dXJuIHJldCA9IGdz dF9wYWRfY2hhaW4ocGFkLCBjaGFubmVsQnVmZmVyKTsKKyAgICAgICAgR3N0Rmxvd1JldHVybiBy ZXQgPSBnc3RfYXBwX3NyY19wdXNoX2J1ZmZlcihHU1RfQVBQX1NSQyhhcHBzcmMpLCBjaGFubmVs QnVmZmVyKTsKICAgICAgICAgaWYgKHJldCAhPSBHU1RfRkxPV19PSykgewotICAgICAgICAgICAg R1NUX0VMRU1FTlRfRVJST1Ioc3JjLCBDT1JFLCBQQUQsICgiSW50ZXJuYWwgV2ViQXVkaW9TcmMg ZXJyb3IiKSwgKCJGYWlsZWQgdG8gcHVzaCBidWZmZXIgb24gJXM6JXMgZmxvdzogJXMiLCBHU1Rf REVCVUdfUEFEX05BTUUocGFkKSwgZ3N0X2Zsb3dfZ2V0X25hbWUocmV0KSkpOworICAgICAgICAg ICAgR1NUX0VMRU1FTlRfRVJST1Ioc3JjLCBDT1JFLCBQQUQsICgiSW50ZXJuYWwgV2ViQXVkaW9T cmMgZXJyb3IiKSwgKCJGYWlsZWQgdG8gcHVzaCBidWZmZXIgb24gJXMgZmxvdzogJXMiLCBHU1Rf T0JKRUNUX05BTUUoYXBwc3JjKSwgZ3N0X2Zsb3dfZ2V0X25hbWUocmV0KSkpOwogICAgICAgICAg ICAgZ3N0X3Rhc2tfcGF1c2Uoc3JjLT5wcml2LT50YXNrLmdldCgpKTsKICAgICAgICAgfQogICAg IH0KIAotICAgIHByaXYtPm5ld1N0cmVhbUV2ZW50UGVuZGluZyA9IGZhbHNlOwotCiAgICAgZ19z bGlzdF9mcmVlKGNoYW5uZWxCdWZmZXJMaXN0KTsKIH0KIApAQCAtNDQ0LDcgKzQwNyw3IEBAIHN0 YXRpYyBHc3RTdGF0ZUNoYW5nZVJldHVybiB3ZWJLaXRXZWJBdWRpb1NyY0NoYW5nZVN0YXRlKEdz dEVsZW1lbnQqIGVsZW1lbnQsIEdzCiAgICAgICAgIEdTVF9ERUJVR19PQkpFQ1Qoc3JjLCAiUkVB RFktPlBBVVNFRCIpOwogICAgICAgICBzcmMtPnByaXYtPnBvb2wgPSBnc3RfYnVmZmVyX3Bvb2xf bmV3KCk7CiAgICAgICAgIEdzdFN0cnVjdHVyZSogY29uZmlnID0gZ3N0X2J1ZmZlcl9wb29sX2dl dF9jb25maWcoc3JjLT5wcml2LT5wb29sKTsKLSAgICAgICAgZ3N0X2J1ZmZlcl9wb29sX2NvbmZp Z19zZXRfcGFyYW1zKGNvbmZpZywgbnVsbHB0ciwgc3JjLT5wcml2LT5mcmFtZXNUb1B1bGwgKiBz aXplb2YoZmxvYXQpLCAwLCAwKTsKKyAgICAgICAgZ3N0X2J1ZmZlcl9wb29sX2NvbmZpZ19zZXRf cGFyYW1zKGNvbmZpZywgbnVsbHB0ciwgc3JjLT5wcml2LT5idWZmZXJTaXplLCAwLCAwKTsKICAg ICAgICAgZ3N0X2J1ZmZlcl9wb29sX3NldF9jb25maWcoc3JjLT5wcml2LT5wb29sLCBjb25maWcp OwogICAgICAgICBpZiAoIWdzdF9idWZmZXJfcG9vbF9zZXRfYWN0aXZlKHNyYy0+cHJpdi0+cG9v bCwgVFJVRSkpCiAgICAgICAgICAgICByZXR1cm5WYWx1ZSA9IEdTVF9TVEFURV9DSEFOR0VfRkFJ TFVSRTsKQEAgLTQ1Myw3ICs0MTYsNiBAQCBzdGF0aWMgR3N0U3RhdGVDaGFuZ2VSZXR1cm4gd2Vi S2l0V2ViQXVkaW9TcmNDaGFuZ2VTdGF0ZShHc3RFbGVtZW50KiBlbGVtZW50LCBHcwogICAgICAg ICBicmVhazsKICAgICB9CiAgICAgY2FzZSBHU1RfU1RBVEVfQ0hBTkdFX1BBVVNFRF9UT19SRUFE WToKLSAgICAgICAgc3JjLT5wcml2LT5uZXdTdHJlYW1FdmVudFBlbmRpbmcgPSB0cnVlOwogICAg ICAgICBHU1RfREVCVUdfT0JKRUNUKHNyYywgIlBBVVNFRC0+UkVBRFkiKTsKICAgICAgICAgaWYg KCFnc3RfdGFza19qb2luKHNyYy0+cHJpdi0+dGFzay5nZXQoKSkpCiAgICAgICAgICAgICByZXR1 cm5WYWx1ZSA9IEdTVF9TVEFURV9DSEFOR0VfRkFJTFVSRTsK