148065 2015-08-16 01:51:44 -0700 Holes for find matches that span multiple lines are completely wrong 2015-08-17 11:12:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton mitz mmaxfield sam simon.fraser oldest_to_newest 1118023 0 thorton 2015-08-16 01:51:44 -0700 Holes for find matches that span multiple lines are completely wrong 1118024 1 259118 thorton 2015-08-16 01:52:14 -0700 Created attachment 259118 Patch 1118025 2 259119 thorton 2015-08-16 01:57:19 -0700 Created attachment 259119 Patch 1118026 3 thorton 2015-08-16 02:02:05 -0700 <rdar://problem/5305002> 1118027 4 259120 thorton 2015-08-16 02:03:18 -0700 Created attachment 259120 Patch 1118146 5 259120 simon.fraser 2015-08-17 10:39:51 -0700 Comment on attachment 259120 Patch We should add a way to test DocumentMarkers. 1118156 6 thorton 2015-08-17 10:52:35 -0700 (In reply to comment #5) > Comment on attachment 259120 [details] > Patch > > We should add a way to test DocumentMarkers. There is apparently a mechanism in Internals, so I'm going to try to write a test before landing. 1118158 7 thorton 2015-08-17 11:12:32 -0700 With a test!: http://trac.webkit.org/changeset/188527 259118 2015-08-16 01:52:14 -0700 2015-08-16 01:57:15 -0700 Patch bug-148065-20150816015154.patch text/plain 9162 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzgyZjZmMTM1MDMyOGVi ZjE0ZWY3ODczMzk4YzFkZGRlZDdmZTM2OS4uNjE4MTZmNWIzZTYzNGQ5NTQyMzEzOWRiY2NjMjVj ZTgzMDE0MDY0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDE1LTA4LTE2ICBUaW1v dGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBIb2xlcyBm b3IgZmluZCBtYXRjaGVzIHRoYXQgc3BhbiBtdWx0aXBsZSBsaW5lcyBhcmUgY29tcGxldGVseSB3 cm9uZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4 MDY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVHdv IGJpZyBwcm9ibGVtcyB3aXRoIGZpbmQgaG9sZXM6CisgICAgICAgICAgICAtIFJlbmRlcmVkRG9j dW1lbnRNYXJrZXIgb25seSBoYXMgb25lIHJlY3QsIGJ1dCBhIG1hcmtlciBjYW4gYmUgcGFpbnRl ZAorICAgICAgICAgICAgICBieSBtdWx0aXBsZSB0ZXh0IHJ1bnMsIGVhY2ggd2l0aCB0aGVpciBv d24gcmVuZGVyZWQgcmVjdAorICAgICAgICAgICAgLSBwYWludFRleHRNYXRjaE1hcmtlciBkb2Vz IHN0ZDo6bWF4KCh1bnNpZ25lZClhLCAodW5zaWduZWQpMCksIHdoaWNoIGlzCisgICAgICAgICAg ICAgIG9idmlvdXNseSBhbiBvdmVyZmxvdyBwcm9ibGVtL25vdCBnb2luZyB0byB3b3JrIGlmIGEg aXMgbmVnYXRpdmUKKworICAgICAgICBUaGUgY29tYmluYXRpb24gb2YgdGhlc2UgaXNzdWVzIGNh dXNlcyB0aGUgaG9sZXMgZm9yIGZpbmQgbWF0Y2hlcyB0byBiZQorICAgICAgICB2ZXJ5IGJyb2tl bjogdGV4dCB0aGF0IGlzbid0IHBhcnQgb2YgdGhlIG1hdGNoIGlzIGhpZ2hsaWdodGVkLCBhbmQg c29tZQorICAgICAgICB0ZXh0IHRoYXQgaXMgcGFydCBvZiB0aGUgbWF0Y2ggaXNuJ3QgaGlnaGxp Z2h0ZWQuCisKKyAgICAgICAgVG8gZml4LCBtYWtlIFJlbmRlcmVkRG9jdW1lbnRNYXJrZXIgc3Vw cG9ydCBtdWx0aXBsZSByZWN0cywgYW5kIHVzZSBzaWduZWQKKyAgICAgICAgbWF0aCAobGlrZSBw YWludERvY3VtZW50TWFya2VyIGFscmVhZHkgZGlkKSB3aGVuIGNvbXB1dGluZyBwb3NpdGlvbnMg aW4gcGFpbnRUZXh0TWF0Y2hNYXJrZXIuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnRNYXJrZXJD b250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TWFya2VyQ29udHJvbGxl cjo6YWRkVGV4dE1hdGNoTWFya2VyKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TWFya2Vy Q29udHJvbGxlcjo6cmVuZGVyZWRSZWN0c0Zvck1hcmtlcnMpOgorICAgICAgICAqIGRvbS9SZW5k ZXJlZERvY3VtZW50TWFya2VyLmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJlZERvY3VtZW50 TWFya2VyOjpSZW5kZXJlZERvY3VtZW50TWFya2VyKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl cmVkRG9jdW1lbnRNYXJrZXI6OmlzUmVuZGVyZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy ZWREb2N1bWVudE1hcmtlcjo6Y29udGFpbnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyZWRE b2N1bWVudE1hcmtlcjo6YWRkUmVuZGVyZWRSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl cmVkRG9jdW1lbnRNYXJrZXI6OnJlbmRlcmVkUmVjdHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyZWREb2N1bWVudE1hcmtlcjo6aW52YWxpZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJlZERvY3VtZW50TWFya2VyOjpzZXRSZW5kZXJlZFJlY3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyZWREb2N1bWVudE1hcmtlcjo6cmVuZGVyZWRSZWN0KTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcmVkRG9jdW1lbnRNYXJrZXI6OmludmFsaWRNYXJrZXJS ZWN0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94OjpwYWludERvY3VtZW50TWFya2VyKToKKyAg ICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50VGV4dE1hdGNoTWFya2VyKToKKyAg ICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OmNvbXB1dGVSZWN0Rm9yUmVwbGFjZW1lbnRN YXJrZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvU1ZHSW5saW5lRmxvd0JveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTVkdJbmxpbmVGbG93Qm94Ojpjb21wdXRlVGV4dE1hdGNoTWFya2Vy UmVjdEZvclJlbmRlcmVyKToKKwogMjAxNS0wOC0xNSAgVGltb3RoeSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjE2ODMyNyk6IEltYWdl RG9jdW1lbnRzIHdpdGggbWFyZ2lucyB6b29tIHRvIHRoZSB3cm9uZyBwb3NpdGlvbiB3aGVuIGNs aWNrZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE1hcmtlckNvbnRy b2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxlci5j cHAKaW5kZXggMWQyMzA0OWY2N2M5MjU3MTQ1NWU2ODMxZWM5ZGZjMjA4OGMzYjIwZi4uYWI0MzZm MjZkOWQzMDQyYjFiMGM1ZWE2MDE3NWNlY2ZmMjcxYmY3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxlci5jcHAKQEAgLTEwMiw3ICsxMDIsNyBAQCB2 b2lkIERvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6YWRkVGV4dE1hdGNoTWFya2VyKGNvbnN0IFJh bmdlKiByYW5nZSwgYm9vbCBhY3RpdgogICAgICAgICAgICAgLy8gbWF0Y2hlcyBvZmYtc2NyZWVu IGFyZSAodGhhdCBoYXZlbid0IGJlZW4gcGFpbnRlZCB5ZXQpLgogICAgICAgICAgICAgTm9kZSog bm9kZSA9IHRleHRQaWVjZS0+c3RhcnRDb250YWluZXIoKTsKICAgICAgICAgICAgIFZlY3RvcjxS ZW5kZXJlZERvY3VtZW50TWFya2VyKj4gbWFya2VycyA9IG1hcmtlcnNGb3Iobm9kZSk7Ci0gICAg ICAgICAgICBtYXJrZXJzW21hcmtlcnMuc2l6ZSgpIC0gMV0tPnNldFJlbmRlcmVkUmVjdChyYW5n ZS0+YWJzb2x1dGVCb3VuZGluZ0JveCgpKTsKKyAgICAgICAgICAgIG1hcmtlcnNbbWFya2Vycy5z aXplKCkgLSAxXS0+YWRkUmVuZGVyZWRSZWN0KHJhbmdlLT5hYnNvbHV0ZUJvdW5kaW5nQm94KCkp OwogICAgICAgICB9CiAgICAgfQogfQpAQCAtNDQyLDcgKzQ0Miw3IEBAIFZlY3RvcjxJbnRSZWN0 PiBEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6OnJlbmRlcmVkUmVjdHNGb3JNYXJrZXJzKERvY3Vt ZW50TWFya2VyCiAgICAgICAgICAgICBpZiAoIW1hcmtlci5pc1JlbmRlcmVkKCkpCiAgICAgICAg ICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQobWFya2VyLnJl bmRlcmVkUmVjdCgpKTsKKyAgICAgICAgICAgIHJlc3VsdC5hcHBlbmRWZWN0b3IobWFya2VyLnJl bmRlcmVkUmVjdHMoKSk7CiAgICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9SZW5kZXJlZERvY3VtZW50TWFya2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20v UmVuZGVyZWREb2N1bWVudE1hcmtlci5oCmluZGV4IDdkNDgxMTVkMTAyOTI0MTlmOTc5MmQ3ODY5 NjRkYWI0MzM4YWI0MmMuLmJhNWNlNTliZDZmYjA2N2ExOGJhMGEzY2Q1NDU3NzhkZTc4ZDI2YjMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9SZW5kZXJlZERvY3VtZW50TWFya2VyLmgK KysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1JlbmRlcmVkRG9jdW1lbnRNYXJrZXIuaApAQCAtMjgs NiArMjgsNyBAQAogI2RlZmluZSBSZW5kZXJlZERvY3VtZW50TWFya2VyX2gKIAogI2luY2x1ZGUg IkRvY3VtZW50TWFya2VyLmgiCisjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKQEAgLTM1LDMyICszNiwzOSBAQCBjbGFzcyBSZW5kZXJlZERvY3VtZW50TWFy a2VyIDogcHVibGljIERvY3VtZW50TWFya2VyIHsKIHB1YmxpYzoKIAogICAgIGV4cGxpY2l0IFJl bmRlcmVkRG9jdW1lbnRNYXJrZXIoY29uc3QgRG9jdW1lbnRNYXJrZXImIG1hcmtlcikKLSAgICAg ICAgOiBEb2N1bWVudE1hcmtlcihtYXJrZXIpLCBtX3JlbmRlcmVkUmVjdChpbnZhbGlkTWFya2Vy UmVjdCgpKQorICAgICAgICA6IERvY3VtZW50TWFya2VyKG1hcmtlciksIG1fcmVuZGVyZWRSZWN0 cygpCiAgICAgewogICAgIH0KIAotICAgIGJvb2wgaXNSZW5kZXJlZCgpIGNvbnN0IHsgcmV0dXJu IGludmFsaWRNYXJrZXJSZWN0KCkgIT0gbV9yZW5kZXJlZFJlY3Q7IH0KLSAgICBib29sIGNvbnRh aW5zKGNvbnN0IExheW91dFBvaW50JiBwb2ludCkgY29uc3QgeyByZXR1cm4gaXNSZW5kZXJlZCgp ICYmIG1fcmVuZGVyZWRSZWN0LmNvbnRhaW5zKHBvaW50KTsgfQotICAgIHZvaWQgc2V0UmVuZGVy ZWRSZWN0KGNvbnN0IExheW91dFJlY3QmIHIpIHsgbV9yZW5kZXJlZFJlY3QgPSByOyB9Ci0gICAg Y29uc3QgTGF5b3V0UmVjdCYgcmVuZGVyZWRSZWN0KCkgY29uc3QgeyByZXR1cm4gbV9yZW5kZXJl ZFJlY3Q7IH0KLSAgICB2b2lkIGludmFsaWRhdGUoY29uc3QgTGF5b3V0UmVjdCYpOwotICAgIHZv aWQgaW52YWxpZGF0ZSgpIHsgbV9yZW5kZXJlZFJlY3QgPSBpbnZhbGlkTWFya2VyUmVjdCgpOyB9 CisgICAgYm9vbCBpc1JlbmRlcmVkKCkgY29uc3QgeyByZXR1cm4gIW1fcmVuZGVyZWRSZWN0cy5p c0VtcHR5KCk7IH0KKyAgICBib29sIGNvbnRhaW5zKGNvbnN0IExheW91dFBvaW50JiBwb2ludCkg Y29uc3QKKyAgICB7CisgICAgICAgIGlmICghaXNSZW5kZXJlZCgpKQorICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIHJlY3QgOiBtX3JlbmRlcmVkUmVj dHMpIHsKKyAgICAgICAgICAgIGlmIChyZWN0LmNvbnRhaW5zKHBvaW50KSkKKyAgICAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg fQogCi1wcml2YXRlOgotICAgIHN0YXRpYyBjb25zdCBMYXlvdXRSZWN0JiBpbnZhbGlkTWFya2Vy UmVjdCgpCisgICAgdm9pZCBhZGRSZW5kZXJlZFJlY3QoY29uc3QgTGF5b3V0UmVjdCYgcikgeyBt X3JlbmRlcmVkUmVjdHMuYXBwZW5kKHIpOyB9CisgICAgY29uc3QgVmVjdG9yPExheW91dFJlY3Qs IDE+JiByZW5kZXJlZFJlY3RzKCkgY29uc3QgeyByZXR1cm4gbV9yZW5kZXJlZFJlY3RzOyB9Cisg ICAgdm9pZCBpbnZhbGlkYXRlKGNvbnN0IExheW91dFJlY3QmIHIpCiAgICAgewotICAgICAgICBz dGF0aWMgY29uc3QgTGF5b3V0UmVjdCByZWN0ID0gTGF5b3V0UmVjdCgtMSwgLTEsIC0xLCAtMSk7 Ci0gICAgICAgIHJldHVybiByZWN0OworICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIHJlY3QgOiBt X3JlbmRlcmVkUmVjdHMpIHsKKyAgICAgICAgICAgIGlmIChyZWN0LmludGVyc2VjdHMocikpIHsK KyAgICAgICAgICAgICAgICBpbnZhbGlkYXRlKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgfQorICAgIHZvaWQgaW52YWxpZGF0ZSgpIHsg bV9yZW5kZXJlZFJlY3RzLmNsZWFyKCk7IH0KIAotICAgIExheW91dFJlY3QgbV9yZW5kZXJlZFJl Y3Q7Citwcml2YXRlOgorICAgIFZlY3RvcjxMYXlvdXRSZWN0LCAxPiBtX3JlbmRlcmVkUmVjdHM7 CiB9OwogCi1pbmxpbmUgdm9pZCBSZW5kZXJlZERvY3VtZW50TWFya2VyOjppbnZhbGlkYXRlKGNv bnN0IExheW91dFJlY3QmIHIpCi17Ci0gICAgaWYgKG1fcmVuZGVyZWRSZWN0LmludGVyc2VjdHMo cikpCi0gICAgICAgIGludmFsaWRhdGUoKTsKLX0KIAogfSAvLyBuYW1lc3BhY2UKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCmluZGV4IDQwYjRkMmUzOTljZjQw NmNlYmU4MzE2OTZjMmRkMzIwNDFkN2M5NGEuLjllNmQyY2VjMGZkNDU0M2E2N2FhNzhmYmMyZDcx ZDJkZjgyNDBiOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVU ZXh0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5j cHAKQEAgLTExMDQsNyArMTEwNCw3IEBAIHZvaWQgSW5saW5lVGV4dEJveDo6cGFpbnREb2N1bWVu dE1hcmtlcihHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZsb2F0UG9pCiAgICAgICAg IGlmIChncmFtbWFyIHx8IGlzRGljdGF0aW9uTWFya2VyKSB7CiAgICAgICAgICAgICBtYXJrZXJS ZWN0Lm1vdmUoLWJveE9yaWdpbi54KCksIC1ib3hPcmlnaW4ueSgpKTsKICAgICAgICAgICAgIG1h cmtlclJlY3QgPSByZW5kZXJlcigpLmxvY2FsVG9BYnNvbHV0ZVF1YWQoRmxvYXRSZWN0KG1hcmtl clJlY3QpKS5lbmNsb3NpbmdCb3VuZGluZ0JveCgpOwotICAgICAgICAgICAgbWFya2VyLnNldFJl bmRlcmVkUmVjdChtYXJrZXJSZWN0KTsKKyAgICAgICAgICAgIG1hcmtlci5hZGRSZW5kZXJlZFJl Y3QobWFya2VyUmVjdCk7CiAgICAgICAgIH0KICAgICB9CiAgICAgCkBAIC0xMTMyLDggKzExMzIs OCBAQCB2b2lkIElubGluZVRleHRCb3g6OnBhaW50VGV4dE1hdGNoTWFya2VyKEdyYXBoaWNzQ29u dGV4dCYgY29udGV4dCwgY29uc3QgRmxvYXRQbwogewogICAgIExheW91dFVuaXQgc2VsZWN0aW9u SGVpZ2h0ID0gdGhpcy0+c2VsZWN0aW9uSGVpZ2h0KCk7CiAKLSAgICBpbnQgc1BvcyA9IHN0ZDo6 bWF4KG1hcmtlci5zdGFydE9mZnNldCgpIC0gbV9zdGFydCwgKHVuc2lnbmVkKTApOwotICAgIGlu dCBlUG9zID0gc3RkOjptaW4obWFya2VyLmVuZE9mZnNldCgpIC0gbV9zdGFydCwgKHVuc2lnbmVk KW1fbGVuKTsKKyAgICBpbnQgc1BvcyA9IHN0ZDo6bWF4PGludD4obWFya2VyLnN0YXJ0T2Zmc2V0 KCkgLSBtX3N0YXJ0LCAwKTsKKyAgICBpbnQgZVBvcyA9IHN0ZDo6bWluPGludD4obWFya2VyLmVu ZE9mZnNldCgpIC0gbV9zdGFydCwgbV9sZW4pOwogICAgIFRleHRSdW4gcnVuID0gY29uc3RydWN0 VGV4dFJ1bihzdHlsZSwgZm9udCk7CiAKICAgICAvLyBBbHdheXMgY29tcHV0ZSBhbmQgc3RvcmUg dGhlIHJlY3QgYXNzb2NpYXRlZCB3aXRoIHRoaXMgbWFya2VyLiBUaGUgY29tcHV0ZWQgcmVjdCBp cyBpbiBhYnNvbHV0ZSBjb29yZGluYXRlcy4KQEAgLTExNDIsNyArMTE0Miw3IEBAIHZvaWQgSW5s aW5lVGV4dEJveDo6cGFpbnRUZXh0TWF0Y2hNYXJrZXIoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0 LCBjb25zdCBGbG9hdFBvCiAgICAgZm9udC5hZGp1c3RTZWxlY3Rpb25SZWN0Rm9yVGV4dChydW4s IHJlbmRlcmVkUmVjdCwgc1BvcywgZVBvcyk7CiAgICAgSW50UmVjdCBtYXJrZXJSZWN0ID0gZW5j bG9zaW5nSW50UmVjdChyZW5kZXJlZFJlY3QpOwogICAgIG1hcmtlclJlY3QgPSByZW5kZXJlcigp LmxvY2FsVG9BYnNvbHV0ZVF1YWQoRmxvYXRRdWFkKG1hcmtlclJlY3QpKS5lbmNsb3NpbmdCb3Vu ZGluZ0JveCgpOwotICAgIG1hcmtlci5zZXRSZW5kZXJlZFJlY3QobWFya2VyUmVjdCk7CisgICAg bWFya2VyLmFkZFJlbmRlcmVkUmVjdChtYXJrZXJSZWN0KTsKICAgICAKICAgICAvLyBPcHRpb25h bGx5IGhpZ2hsaWdodCB0aGUgdGV4dAogICAgIGlmIChyZW5kZXJlcigpLmZyYW1lKCkuZWRpdG9y KCkubWFya2VkVGV4dE1hdGNoZXNBcmVIaWdobGlnaHRlZCgpKSB7CkBAIC0xMTc0LDcgKzExNzQs NyBAQCB2b2lkIElubGluZVRleHRCb3g6OmNvbXB1dGVSZWN0Rm9yUmVwbGFjZW1lbnRNYXJrZXIo UmVuZGVyZWREb2N1bWVudE1hcmtlciYgbWFyawogICAgIGZvbnQuYWRqdXN0U2VsZWN0aW9uUmVj dEZvclRleHQocnVuLCBzZWxlY3Rpb25SZWN0LCBzUG9zLCBlUG9zKTsKICAgICBJbnRSZWN0IG1h cmtlclJlY3QgPSBlbmNsb3NpbmdJbnRSZWN0KHNlbGVjdGlvblJlY3QpOwogICAgIG1hcmtlclJl Y3QgPSByZW5kZXJlcigpLmxvY2FsVG9BYnNvbHV0ZVF1YWQoRmxvYXRSZWN0KG1hcmtlclJlY3Qp KS5lbmNsb3NpbmdCb3VuZGluZ0JveCgpOwotICAgIG1hcmtlci5zZXRSZW5kZXJlZFJlY3QobWFy a2VyUmVjdCk7CisgICAgbWFya2VyLmFkZFJlbmRlcmVkUmVjdChtYXJrZXJSZWN0KTsKIH0KICAg ICAKIHZvaWQgSW5saW5lVGV4dEJveDo6cGFpbnREb2N1bWVudE1hcmtlcnMoR3JhcGhpY3NDb250 ZXh0JiBjb250ZXh0LCBjb25zdCBGbG9hdFBvaW50JiBib3hPcmlnaW4sIGNvbnN0IFJlbmRlclN0 eWxlJiBzdHlsZSwgY29uc3QgRm9udENhc2NhZGUmIGZvbnQsIGJvb2wgYmFja2dyb3VuZCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHSW5saW5lRmxvd0JveC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR0lubGluZUZsb3dCb3guY3BwCmlu ZGV4IGFkMzQ1ZjBjOWNmZWNlNGU0YTM3NjcxOTZmODViOGE0MjAwMjYzMTAuLmQxZjRjNWMzZWFm OWYzYjkxMjhmM2MzYjk5NzMyMzcyMGYzZTZmYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdmcvU1ZHSW5saW5lRmxvd0JveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVGbG93Qm94LmNwcApAQCAtMTI0LDcgKzEyNCw3IEBAIHZv aWQgU1ZHSW5saW5lRmxvd0JveDo6Y29tcHV0ZVRleHRNYXRjaE1hcmtlclJlY3RGb3JSZW5kZXJl cihSZW5kZXJTVkdJbmxpbmVUZXh0CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAg ICBtYXJrZXItPnNldFJlbmRlcmVkUmVjdCh0ZXh0UmVuZGVyZXItPmxvY2FsVG9BYnNvbHV0ZVF1 YWQobWFya2VyUmVjdCkuZW5jbG9zaW5nQm91bmRpbmdCb3goKSk7CisgICAgICAgIG1hcmtlci0+ YWRkUmVuZGVyZWRSZWN0KHRleHRSZW5kZXJlci0+bG9jYWxUb0Fic29sdXRlUXVhZChtYXJrZXJS ZWN0KS5lbmNsb3NpbmdCb3VuZGluZ0JveCgpKTsKICAgICB9CiB9CiAK 259119 2015-08-16 01:57:19 -0700 2015-08-16 02:03:11 -0700 Patch bug-148065-20150816015658.patch text/plain 9079 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzgyZjZmMTM1MDMyOGVi ZjE0ZWY3ODczMzk4YzFkZGRlZDdmZTM2OS4uNjE4MTZmNWIzZTYzNGQ5NTQyMzEzOWRiY2NjMjVj ZTgzMDE0MDY0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDE1LTA4LTE2ICBUaW1v dGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBIb2xlcyBm b3IgZmluZCBtYXRjaGVzIHRoYXQgc3BhbiBtdWx0aXBsZSBsaW5lcyBhcmUgY29tcGxldGVseSB3 cm9uZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4 MDY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVHdv IGJpZyBwcm9ibGVtcyB3aXRoIGZpbmQgaG9sZXM6CisgICAgICAgICAgICAtIFJlbmRlcmVkRG9j dW1lbnRNYXJrZXIgb25seSBoYXMgb25lIHJlY3QsIGJ1dCBhIG1hcmtlciBjYW4gYmUgcGFpbnRl ZAorICAgICAgICAgICAgICBieSBtdWx0aXBsZSB0ZXh0IHJ1bnMsIGVhY2ggd2l0aCB0aGVpciBv d24gcmVuZGVyZWQgcmVjdAorICAgICAgICAgICAgLSBwYWludFRleHRNYXRjaE1hcmtlciBkb2Vz IHN0ZDo6bWF4KCh1bnNpZ25lZClhLCAodW5zaWduZWQpMCksIHdoaWNoIGlzCisgICAgICAgICAg ICAgIG9idmlvdXNseSBhbiBvdmVyZmxvdyBwcm9ibGVtL25vdCBnb2luZyB0byB3b3JrIGlmIGEg aXMgbmVnYXRpdmUKKworICAgICAgICBUaGUgY29tYmluYXRpb24gb2YgdGhlc2UgaXNzdWVzIGNh dXNlcyB0aGUgaG9sZXMgZm9yIGZpbmQgbWF0Y2hlcyB0byBiZQorICAgICAgICB2ZXJ5IGJyb2tl bjogdGV4dCB0aGF0IGlzbid0IHBhcnQgb2YgdGhlIG1hdGNoIGlzIGhpZ2hsaWdodGVkLCBhbmQg c29tZQorICAgICAgICB0ZXh0IHRoYXQgaXMgcGFydCBvZiB0aGUgbWF0Y2ggaXNuJ3QgaGlnaGxp Z2h0ZWQuCisKKyAgICAgICAgVG8gZml4LCBtYWtlIFJlbmRlcmVkRG9jdW1lbnRNYXJrZXIgc3Vw cG9ydCBtdWx0aXBsZSByZWN0cywgYW5kIHVzZSBzaWduZWQKKyAgICAgICAgbWF0aCAobGlrZSBw YWludERvY3VtZW50TWFya2VyIGFscmVhZHkgZGlkKSB3aGVuIGNvbXB1dGluZyBwb3NpdGlvbnMg aW4gcGFpbnRUZXh0TWF0Y2hNYXJrZXIuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnRNYXJrZXJD b250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TWFya2VyQ29udHJvbGxl cjo6YWRkVGV4dE1hdGNoTWFya2VyKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TWFya2Vy Q29udHJvbGxlcjo6cmVuZGVyZWRSZWN0c0Zvck1hcmtlcnMpOgorICAgICAgICAqIGRvbS9SZW5k ZXJlZERvY3VtZW50TWFya2VyLmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJlZERvY3VtZW50 TWFya2VyOjpSZW5kZXJlZERvY3VtZW50TWFya2VyKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl cmVkRG9jdW1lbnRNYXJrZXI6OmlzUmVuZGVyZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy ZWREb2N1bWVudE1hcmtlcjo6Y29udGFpbnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyZWRE b2N1bWVudE1hcmtlcjo6YWRkUmVuZGVyZWRSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl cmVkRG9jdW1lbnRNYXJrZXI6OnJlbmRlcmVkUmVjdHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyZWREb2N1bWVudE1hcmtlcjo6aW52YWxpZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJlZERvY3VtZW50TWFya2VyOjpzZXRSZW5kZXJlZFJlY3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyZWREb2N1bWVudE1hcmtlcjo6cmVuZGVyZWRSZWN0KTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcmVkRG9jdW1lbnRNYXJrZXI6OmludmFsaWRNYXJrZXJS ZWN0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94OjpwYWludERvY3VtZW50TWFya2VyKToKKyAg ICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50VGV4dE1hdGNoTWFya2VyKToKKyAg ICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OmNvbXB1dGVSZWN0Rm9yUmVwbGFjZW1lbnRN YXJrZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvU1ZHSW5saW5lRmxvd0JveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTVkdJbmxpbmVGbG93Qm94Ojpjb21wdXRlVGV4dE1hdGNoTWFya2Vy UmVjdEZvclJlbmRlcmVyKToKKwogMjAxNS0wOC0xNSAgVGltb3RoeSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjE2ODMyNyk6IEltYWdl RG9jdW1lbnRzIHdpdGggbWFyZ2lucyB6b29tIHRvIHRoZSB3cm9uZyBwb3NpdGlvbiB3aGVuIGNs aWNrZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE1hcmtlckNvbnRy b2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxlci5j cHAKaW5kZXggMWQyMzA0OWY2N2M5MjU3MTQ1NWU2ODMxZWM5ZGZjMjA4OGMzYjIwZi4uODEwOTQz ZDNiNWUyMGMyZGJhNjIxY2I2ZWI2MWQzZThjMzEyNjM5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxlci5jcHAKQEAgLTEwMiw3ICsxMDIsNyBAQCB2 b2lkIERvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6YWRkVGV4dE1hdGNoTWFya2VyKGNvbnN0IFJh bmdlKiByYW5nZSwgYm9vbCBhY3RpdgogICAgICAgICAgICAgLy8gbWF0Y2hlcyBvZmYtc2NyZWVu IGFyZSAodGhhdCBoYXZlbid0IGJlZW4gcGFpbnRlZCB5ZXQpLgogICAgICAgICAgICAgTm9kZSog bm9kZSA9IHRleHRQaWVjZS0+c3RhcnRDb250YWluZXIoKTsKICAgICAgICAgICAgIFZlY3RvcjxS ZW5kZXJlZERvY3VtZW50TWFya2VyKj4gbWFya2VycyA9IG1hcmtlcnNGb3Iobm9kZSk7Ci0gICAg ICAgICAgICBtYXJrZXJzW21hcmtlcnMuc2l6ZSgpIC0gMV0tPnNldFJlbmRlcmVkUmVjdChyYW5n ZS0+YWJzb2x1dGVCb3VuZGluZ0JveCgpKTsKKyAgICAgICAgICAgIG1hcmtlcnNbbWFya2Vycy5z aXplKCkgLSAxXS0+YWRkUmVuZGVyZWRSZWN0KHJhbmdlLT5hYnNvbHV0ZUJvdW5kaW5nQm94KCkp OwogICAgICAgICB9CiAgICAgfQogfQpAQCAtNDM5LDEwICs0MzksNyBAQCBWZWN0b3I8SW50UmVj dD4gRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyOjpyZW5kZXJlZFJlY3RzRm9yTWFya2VycyhEb2N1 bWVudE1hcmtlcgogICAgICAgICAgICAgaWYgKG1hcmtlci50eXBlKCkgIT0gbWFya2VyVHlwZSkK ICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICAgICAgaWYgKCFtYXJrZXIuaXNS ZW5kZXJlZCgpKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotCi0gICAgICAgICAgICByZXN1 bHQuYXBwZW5kKG1hcmtlci5yZW5kZXJlZFJlY3QoKSk7CisgICAgICAgICAgICByZXN1bHQuYXBw ZW5kVmVjdG9yKG1hcmtlci5yZW5kZXJlZFJlY3RzKCkpOwogICAgICAgICB9CiAgICAgfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vUmVuZGVyZWREb2N1bWVudE1hcmtlci5oIGIv U291cmNlL1dlYkNvcmUvZG9tL1JlbmRlcmVkRG9jdW1lbnRNYXJrZXIuaAppbmRleCA3ZDQ4MTE1 ZDEwMjkyNDE5Zjk3OTJkNzg2OTY0ZGFiNDMzOGFiNDJjLi44OTk4YzY2OTU5MmVmYjBmYjQwODk0 ODhjN2VmMWRjNGIyOGM4ZTlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vUmVuZGVy ZWREb2N1bWVudE1hcmtlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9SZW5kZXJlZERvY3Vt ZW50TWFya2VyLmgKQEAgLTI4LDM5ICsyOCw0MyBAQAogI2RlZmluZSBSZW5kZXJlZERvY3VtZW50 TWFya2VyX2gKIAogI2luY2x1ZGUgIkRvY3VtZW50TWFya2VyLmgiCisjaW5jbHVkZSA8d3RmL1Zl Y3Rvci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIFJlbmRlcmVkRG9jdW1lbnRN YXJrZXIgOiBwdWJsaWMgRG9jdW1lbnRNYXJrZXIgewogcHVibGljOgotCiAgICAgZXhwbGljaXQg UmVuZGVyZWREb2N1bWVudE1hcmtlcihjb25zdCBEb2N1bWVudE1hcmtlciYgbWFya2VyKQotICAg ICAgICA6IERvY3VtZW50TWFya2VyKG1hcmtlciksIG1fcmVuZGVyZWRSZWN0KGludmFsaWRNYXJr ZXJSZWN0KCkpCisgICAgICAgIDogRG9jdW1lbnRNYXJrZXIobWFya2VyKQogICAgIHsKICAgICB9 CiAKLSAgICBib29sIGlzUmVuZGVyZWQoKSBjb25zdCB7IHJldHVybiBpbnZhbGlkTWFya2VyUmVj dCgpICE9IG1fcmVuZGVyZWRSZWN0OyB9Ci0gICAgYm9vbCBjb250YWlucyhjb25zdCBMYXlvdXRQ b2ludCYgcG9pbnQpIGNvbnN0IHsgcmV0dXJuIGlzUmVuZGVyZWQoKSAmJiBtX3JlbmRlcmVkUmVj dC5jb250YWlucyhwb2ludCk7IH0KLSAgICB2b2lkIHNldFJlbmRlcmVkUmVjdChjb25zdCBMYXlv dXRSZWN0JiByKSB7IG1fcmVuZGVyZWRSZWN0ID0gcjsgfQotICAgIGNvbnN0IExheW91dFJlY3Qm IHJlbmRlcmVkUmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVuZGVyZWRSZWN0OyB9Ci0gICAgdm9p ZCBpbnZhbGlkYXRlKGNvbnN0IExheW91dFJlY3QmKTsKLSAgICB2b2lkIGludmFsaWRhdGUoKSB7 IG1fcmVuZGVyZWRSZWN0ID0gaW52YWxpZE1hcmtlclJlY3QoKTsgfQorICAgIGJvb2wgY29udGFp bnMoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50KSBjb25zdAorICAgIHsKKyAgICAgICAgZm9yIChj b25zdCBhdXRvJiByZWN0IDogbV9yZW5kZXJlZFJlY3RzKSB7CisgICAgICAgICAgICBpZiAocmVj dC5jb250YWlucyhwb2ludCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAg IH0KKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KIAotcHJpdmF0ZToKLSAgICBzdGF0aWMg Y29uc3QgTGF5b3V0UmVjdCYgaW52YWxpZE1hcmtlclJlY3QoKQorICAgIHZvaWQgYWRkUmVuZGVy ZWRSZWN0KGNvbnN0IExheW91dFJlY3QmIHIpIHsgbV9yZW5kZXJlZFJlY3RzLmFwcGVuZChyKTsg fQorICAgIGNvbnN0IFZlY3RvcjxMYXlvdXRSZWN0LCAxPiYgcmVuZGVyZWRSZWN0cygpIGNvbnN0 IHsgcmV0dXJuIG1fcmVuZGVyZWRSZWN0czsgfQorICAgIHZvaWQgaW52YWxpZGF0ZShjb25zdCBM YXlvdXRSZWN0JiByKQogICAgIHsKLSAgICAgICAgc3RhdGljIGNvbnN0IExheW91dFJlY3QgcmVj dCA9IExheW91dFJlY3QoLTEsIC0xLCAtMSwgLTEpOwotICAgICAgICByZXR1cm4gcmVjdDsKKyAg ICAgICAgZm9yIChjb25zdCBhdXRvJiByZWN0IDogbV9yZW5kZXJlZFJlY3RzKSB7CisgICAgICAg ICAgICBpZiAocmVjdC5pbnRlcnNlY3RzKHIpKSB7CisgICAgICAgICAgICAgICAgaW52YWxpZGF0 ZSgpOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQog ICAgIH0KKyAgICB2b2lkIGludmFsaWRhdGUoKSB7IG1fcmVuZGVyZWRSZWN0cy5jbGVhcigpOyB9 CiAKLSAgICBMYXlvdXRSZWN0IG1fcmVuZGVyZWRSZWN0OworcHJpdmF0ZToKKyAgICBWZWN0b3I8 TGF5b3V0UmVjdCwgMT4gbV9yZW5kZXJlZFJlY3RzOwogfTsKIAotaW5saW5lIHZvaWQgUmVuZGVy ZWREb2N1bWVudE1hcmtlcjo6aW52YWxpZGF0ZShjb25zdCBMYXlvdXRSZWN0JiByKQotewotICAg IGlmIChtX3JlbmRlcmVkUmVjdC5pbnRlcnNlY3RzKHIpKQotICAgICAgICBpbnZhbGlkYXRlKCk7 Ci19CiAKIH0gLy8gbmFtZXNwYWNlCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9JbmxpbmVUZXh0Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVU ZXh0Qm94LmNwcAppbmRleCA0MGI0ZDJlMzk5Y2Y0MDZjZWJlODMxNjk2YzJkZDMyMDQxZDdjOTRh Li45ZTZkMmNlYzBmZDQ1NDNhNjdhYTc4ZmJjMmQ3MWQyZGY4MjQwYjhiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCkBAIC0xMTA0LDcgKzExMDQsNyBAQCB2 b2lkIElubGluZVRleHRCb3g6OnBhaW50RG9jdW1lbnRNYXJrZXIoR3JhcGhpY3NDb250ZXh0JiBj b250ZXh0LCBjb25zdCBGbG9hdFBvaQogICAgICAgICBpZiAoZ3JhbW1hciB8fCBpc0RpY3RhdGlv bk1hcmtlcikgewogICAgICAgICAgICAgbWFya2VyUmVjdC5tb3ZlKC1ib3hPcmlnaW4ueCgpLCAt Ym94T3JpZ2luLnkoKSk7CiAgICAgICAgICAgICBtYXJrZXJSZWN0ID0gcmVuZGVyZXIoKS5sb2Nh bFRvQWJzb2x1dGVRdWFkKEZsb2F0UmVjdChtYXJrZXJSZWN0KSkuZW5jbG9zaW5nQm91bmRpbmdC b3goKTsKLSAgICAgICAgICAgIG1hcmtlci5zZXRSZW5kZXJlZFJlY3QobWFya2VyUmVjdCk7Cisg ICAgICAgICAgICBtYXJrZXIuYWRkUmVuZGVyZWRSZWN0KG1hcmtlclJlY3QpOwogICAgICAgICB9 CiAgICAgfQogICAgIApAQCAtMTEzMiw4ICsxMTMyLDggQEAgdm9pZCBJbmxpbmVUZXh0Qm94Ojpw YWludFRleHRNYXRjaE1hcmtlcihHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZsb2F0 UG8KIHsKICAgICBMYXlvdXRVbml0IHNlbGVjdGlvbkhlaWdodCA9IHRoaXMtPnNlbGVjdGlvbkhl aWdodCgpOwogCi0gICAgaW50IHNQb3MgPSBzdGQ6Om1heChtYXJrZXIuc3RhcnRPZmZzZXQoKSAt IG1fc3RhcnQsICh1bnNpZ25lZCkwKTsKLSAgICBpbnQgZVBvcyA9IHN0ZDo6bWluKG1hcmtlci5l bmRPZmZzZXQoKSAtIG1fc3RhcnQsICh1bnNpZ25lZCltX2xlbik7CisgICAgaW50IHNQb3MgPSBz dGQ6Om1heDxpbnQ+KG1hcmtlci5zdGFydE9mZnNldCgpIC0gbV9zdGFydCwgMCk7CisgICAgaW50 IGVQb3MgPSBzdGQ6Om1pbjxpbnQ+KG1hcmtlci5lbmRPZmZzZXQoKSAtIG1fc3RhcnQsIG1fbGVu KTsKICAgICBUZXh0UnVuIHJ1biA9IGNvbnN0cnVjdFRleHRSdW4oc3R5bGUsIGZvbnQpOwogCiAg ICAgLy8gQWx3YXlzIGNvbXB1dGUgYW5kIHN0b3JlIHRoZSByZWN0IGFzc29jaWF0ZWQgd2l0aCB0 aGlzIG1hcmtlci4gVGhlIGNvbXB1dGVkIHJlY3QgaXMgaW4gYWJzb2x1dGUgY29vcmRpbmF0ZXMu CkBAIC0xMTQyLDcgKzExNDIsNyBAQCB2b2lkIElubGluZVRleHRCb3g6OnBhaW50VGV4dE1hdGNo TWFya2VyKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgRmxvYXRQbwogICAgIGZvbnQu YWRqdXN0U2VsZWN0aW9uUmVjdEZvclRleHQocnVuLCByZW5kZXJlZFJlY3QsIHNQb3MsIGVQb3Mp OwogICAgIEludFJlY3QgbWFya2VyUmVjdCA9IGVuY2xvc2luZ0ludFJlY3QocmVuZGVyZWRSZWN0 KTsKICAgICBtYXJrZXJSZWN0ID0gcmVuZGVyZXIoKS5sb2NhbFRvQWJzb2x1dGVRdWFkKEZsb2F0 UXVhZChtYXJrZXJSZWN0KSkuZW5jbG9zaW5nQm91bmRpbmdCb3goKTsKLSAgICBtYXJrZXIuc2V0 UmVuZGVyZWRSZWN0KG1hcmtlclJlY3QpOworICAgIG1hcmtlci5hZGRSZW5kZXJlZFJlY3QobWFy a2VyUmVjdCk7CiAgICAgCiAgICAgLy8gT3B0aW9uYWxseSBoaWdobGlnaHQgdGhlIHRleHQKICAg ICBpZiAocmVuZGVyZXIoKS5mcmFtZSgpLmVkaXRvcigpLm1hcmtlZFRleHRNYXRjaGVzQXJlSGln aGxpZ2h0ZWQoKSkgewpAQCAtMTE3NCw3ICsxMTc0LDcgQEAgdm9pZCBJbmxpbmVUZXh0Qm94Ojpj b21wdXRlUmVjdEZvclJlcGxhY2VtZW50TWFya2VyKFJlbmRlcmVkRG9jdW1lbnRNYXJrZXImIG1h cmsKICAgICBmb250LmFkanVzdFNlbGVjdGlvblJlY3RGb3JUZXh0KHJ1biwgc2VsZWN0aW9uUmVj dCwgc1BvcywgZVBvcyk7CiAgICAgSW50UmVjdCBtYXJrZXJSZWN0ID0gZW5jbG9zaW5nSW50UmVj dChzZWxlY3Rpb25SZWN0KTsKICAgICBtYXJrZXJSZWN0ID0gcmVuZGVyZXIoKS5sb2NhbFRvQWJz b2x1dGVRdWFkKEZsb2F0UmVjdChtYXJrZXJSZWN0KSkuZW5jbG9zaW5nQm91bmRpbmdCb3goKTsK LSAgICBtYXJrZXIuc2V0UmVuZGVyZWRSZWN0KG1hcmtlclJlY3QpOworICAgIG1hcmtlci5hZGRS ZW5kZXJlZFJlY3QobWFya2VyUmVjdCk7CiB9CiAgICAgCiB2b2lkIElubGluZVRleHRCb3g6OnBh aW50RG9jdW1lbnRNYXJrZXJzKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgRmxvYXRQ b2ludCYgYm94T3JpZ2luLCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IEZvbnRDYXNj YWRlJiBmb250LCBib29sIGJhY2tncm91bmQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3ZnL1NWR0lubGluZUZsb3dCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N2Zy9TVkdJbmxpbmVGbG93Qm94LmNwcAppbmRleCBhZDM0NWYwYzljZmVjZTRlNGEzNzY3 MTk2Zjg1YjhhNDIwMDI2MzEwLi5kMWY0YzVjM2VhZjlmM2I5MTI4ZjNjM2I5OTczMjM3MjBmM2U2 ZmIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR0lubGluZUZs b3dCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHSW5saW5lRmxv d0JveC5jcHAKQEAgLTEyNCw3ICsxMjQsNyBAQCB2b2lkIFNWR0lubGluZUZsb3dCb3g6OmNvbXB1 dGVUZXh0TWF0Y2hNYXJrZXJSZWN0Rm9yUmVuZGVyZXIoUmVuZGVyU1ZHSW5saW5lVGV4dAogICAg ICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAgICAgbWFya2VyLT5zZXRSZW5kZXJlZFJlY3Qo dGV4dFJlbmRlcmVyLT5sb2NhbFRvQWJzb2x1dGVRdWFkKG1hcmtlclJlY3QpLmVuY2xvc2luZ0Jv dW5kaW5nQm94KCkpOworICAgICAgICBtYXJrZXItPmFkZFJlbmRlcmVkUmVjdCh0ZXh0UmVuZGVy ZXItPmxvY2FsVG9BYnNvbHV0ZVF1YWQobWFya2VyUmVjdCkuZW5jbG9zaW5nQm91bmRpbmdCb3go KSk7CiAgICAgfQogfQogCg== 259120 2015-08-16 02:03:18 -0700 2015-08-17 10:39:51 -0700 Patch bug-148065-20150816020257.patch text/plain 9113 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzgyZjZmMTM1MDMyOGVi ZjE0ZWY3ODczMzk4YzFkZGRlZDdmZTM2OS4uZWRhZmRjZmE0YjM0ZThlOWRlNjNlM2EwMmEwNDQy MWQzY2M5NGU0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE1LTA4LTE2ICBUaW1v dGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBIb2xlcyBm b3IgZmluZCBtYXRjaGVzIHRoYXQgc3BhbiBtdWx0aXBsZSBsaW5lcyBhcmUgY29tcGxldGVseSB3 cm9uZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4 MDY1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MzA1MDAyPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFR3byBiaWcgcHJvYmxlbXMgd2l0aCBmaW5k IGhvbGVzOgorICAgICAgICAgICAgLSBSZW5kZXJlZERvY3VtZW50TWFya2VyIG9ubHkgaGFzIG9u ZSByZWN0LCBidXQgYSBtYXJrZXIgY2FuIGJlIHBhaW50ZWQKKyAgICAgICAgICAgICAgYnkgbXVs dGlwbGUgdGV4dCBydW5zLCBlYWNoIHdpdGggdGhlaXIgb3duIHJlbmRlcmVkIHJlY3QKKyAgICAg ICAgICAgIC0gcGFpbnRUZXh0TWF0Y2hNYXJrZXIgZG9lcyBzdGQ6Om1heCgodW5zaWduZWQpYSwg KHVuc2lnbmVkKTApLCB3aGljaCBpcworICAgICAgICAgICAgICBvYnZpb3VzbHkgYW4gb3ZlcmZs b3cgcHJvYmxlbS9ub3QgZ29pbmcgdG8gd29yayBpZiBhIGlzIG5lZ2F0aXZlCisKKyAgICAgICAg VGhlIGNvbWJpbmF0aW9uIG9mIHRoZXNlIGlzc3VlcyBjYXVzZXMgdGhlIGhvbGVzIGZvciBmaW5k IG1hdGNoZXMgdG8gYmUKKyAgICAgICAgdmVyeSBicm9rZW46IHRleHQgdGhhdCBpc24ndCBwYXJ0 IG9mIHRoZSBtYXRjaCBpcyBoaWdobGlnaHRlZCwgYW5kIHNvbWUKKyAgICAgICAgdGV4dCB0aGF0 IGlzIHBhcnQgb2YgdGhlIG1hdGNoIGlzbid0IGhpZ2hsaWdodGVkLgorCisgICAgICAgIFRvIGZp eCwgbWFrZSBSZW5kZXJlZERvY3VtZW50TWFya2VyIHN1cHBvcnQgbXVsdGlwbGUgcmVjdHMsIGFu ZCB1c2Ugc2lnbmVkCisgICAgICAgIG1hdGggKGxpa2UgcGFpbnREb2N1bWVudE1hcmtlciBhbHJl YWR5IGRpZCkgd2hlbiBjb21wdXRpbmcgcG9zaXRpb25zIGluIHBhaW50VGV4dE1hdGNoTWFya2Vy LgorCisgICAgICAgICogZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6OmFkZFRleHRNYXRjaE1hcmtlcik6 CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6OnJlbmRlcmVkUmVj dHNGb3JNYXJrZXJzKToKKyAgICAgICAgKiBkb20vUmVuZGVyZWREb2N1bWVudE1hcmtlci5oOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyZWREb2N1bWVudE1hcmtlcjo6UmVuZGVyZWREb2N1bWVu dE1hcmtlcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJlZERvY3VtZW50TWFya2VyOjppc1Jl bmRlcmVkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcmVkRG9jdW1lbnRNYXJrZXI6OmNvbnRh aW5zKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcmVkRG9jdW1lbnRNYXJrZXI6OmFkZFJlbmRl cmVkUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJlZERvY3VtZW50TWFya2VyOjpyZW5k ZXJlZFJlY3RzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcmVkRG9jdW1lbnRNYXJrZXI6Omlu dmFsaWRhdGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyZWREb2N1bWVudE1hcmtlcjo6c2V0 UmVuZGVyZWRSZWN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcmVkRG9jdW1l bnRNYXJrZXI6OnJlbmRlcmVkUmVjdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJlZERvY3VtZW50TWFya2VyOjppbnZhbGlkTWFya2VyUmVjdCk6IERlbGV0ZWQuCisgICAgICAg ICogcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5l VGV4dEJveDo6cGFpbnREb2N1bWVudE1hcmtlcik6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVU ZXh0Qm94OjpwYWludFRleHRNYXRjaE1hcmtlcik6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVU ZXh0Qm94Ojpjb21wdXRlUmVjdEZvclJlcGxhY2VtZW50TWFya2VyKToKKyAgICAgICAgKiByZW5k ZXJpbmcvc3ZnL1NWR0lubGluZUZsb3dCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHSW5s aW5lRmxvd0JveDo6Y29tcHV0ZVRleHRNYXRjaE1hcmtlclJlY3RGb3JSZW5kZXJlcik6CisKIDIw MTUtMDgtMTUgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAg ICAgICAgIFJFR1JFU1NJT04gKHIxNjgzMjcpOiBJbWFnZURvY3VtZW50cyB3aXRoIG1hcmdpbnMg em9vbSB0byB0aGUgd3JvbmcgcG9zaXRpb24gd2hlbiBjbGlja2VkCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudE1hcmtlckNvbnRyb2xsZXIuY3BwCmluZGV4IDFkMjMwNDlmNjdjOTI1 NzE0NTVlNjgzMWVjOWRmYzIwODhjM2IyMGYuLjgxMDk0M2QzYjVlMjBjMmRiYTYyMWNiNmViNjFk M2U4YzMxMjYzOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE1hcmtl ckNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE1hcmtlckNv bnRyb2xsZXIuY3BwCkBAIC0xMDIsNyArMTAyLDcgQEAgdm9pZCBEb2N1bWVudE1hcmtlckNvbnRy b2xsZXI6OmFkZFRleHRNYXRjaE1hcmtlcihjb25zdCBSYW5nZSogcmFuZ2UsIGJvb2wgYWN0aXYK ICAgICAgICAgICAgIC8vIG1hdGNoZXMgb2ZmLXNjcmVlbiBhcmUgKHRoYXQgaGF2ZW4ndCBiZWVu IHBhaW50ZWQgeWV0KS4KICAgICAgICAgICAgIE5vZGUqIG5vZGUgPSB0ZXh0UGllY2UtPnN0YXJ0 Q29udGFpbmVyKCk7CiAgICAgICAgICAgICBWZWN0b3I8UmVuZGVyZWREb2N1bWVudE1hcmtlcio+ IG1hcmtlcnMgPSBtYXJrZXJzRm9yKG5vZGUpOwotICAgICAgICAgICAgbWFya2Vyc1ttYXJrZXJz LnNpemUoKSAtIDFdLT5zZXRSZW5kZXJlZFJlY3QocmFuZ2UtPmFic29sdXRlQm91bmRpbmdCb3go KSk7CisgICAgICAgICAgICBtYXJrZXJzW21hcmtlcnMuc2l6ZSgpIC0gMV0tPmFkZFJlbmRlcmVk UmVjdChyYW5nZS0+YWJzb2x1dGVCb3VuZGluZ0JveCgpKTsKICAgICAgICAgfQogICAgIH0KIH0K QEAgLTQzOSwxMCArNDM5LDcgQEAgVmVjdG9yPEludFJlY3Q+IERvY3VtZW50TWFya2VyQ29udHJv bGxlcjo6cmVuZGVyZWRSZWN0c0Zvck1hcmtlcnMoRG9jdW1lbnRNYXJrZXIKICAgICAgICAgICAg IGlmIChtYXJrZXIudHlwZSgpICE9IG1hcmtlclR5cGUpCiAgICAgICAgICAgICAgICAgY29udGlu dWU7CiAKLSAgICAgICAgICAgIGlmICghbWFya2VyLmlzUmVuZGVyZWQoKSkKLSAgICAgICAgICAg ICAgICBjb250aW51ZTsKLQotICAgICAgICAgICAgcmVzdWx0LmFwcGVuZChtYXJrZXIucmVuZGVy ZWRSZWN0KCkpOworICAgICAgICAgICAgcmVzdWx0LmFwcGVuZFZlY3RvcihtYXJrZXIucmVuZGVy ZWRSZWN0cygpKTsKICAgICAgICAgfQogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZG9tL1JlbmRlcmVkRG9jdW1lbnRNYXJrZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9SZW5k ZXJlZERvY3VtZW50TWFya2VyLmgKaW5kZXggN2Q0ODExNWQxMDI5MjQxOWY5NzkyZDc4Njk2NGRh YjQzMzhhYjQyYy4uODk5OGM2Njk1OTJlZmIwZmI0MDg5NDg4YzdlZjFkYzRiMjhjOGU5ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1JlbmRlcmVkRG9jdW1lbnRNYXJrZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vUmVuZGVyZWREb2N1bWVudE1hcmtlci5oCkBAIC0yOCwzOSAr MjgsNDMgQEAKICNkZWZpbmUgUmVuZGVyZWREb2N1bWVudE1hcmtlcl9oCiAKICNpbmNsdWRlICJE b2N1bWVudE1hcmtlci5oIgorI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KIAogbmFtZXNwYWNlIFdl YkNvcmUgewogCiBjbGFzcyBSZW5kZXJlZERvY3VtZW50TWFya2VyIDogcHVibGljIERvY3VtZW50 TWFya2VyIHsKIHB1YmxpYzoKLQogICAgIGV4cGxpY2l0IFJlbmRlcmVkRG9jdW1lbnRNYXJrZXIo Y29uc3QgRG9jdW1lbnRNYXJrZXImIG1hcmtlcikKLSAgICAgICAgOiBEb2N1bWVudE1hcmtlciht YXJrZXIpLCBtX3JlbmRlcmVkUmVjdChpbnZhbGlkTWFya2VyUmVjdCgpKQorICAgICAgICA6IERv Y3VtZW50TWFya2VyKG1hcmtlcikKICAgICB7CiAgICAgfQogCi0gICAgYm9vbCBpc1JlbmRlcmVk KCkgY29uc3QgeyByZXR1cm4gaW52YWxpZE1hcmtlclJlY3QoKSAhPSBtX3JlbmRlcmVkUmVjdDsg fQotICAgIGJvb2wgY29udGFpbnMoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50KSBjb25zdCB7IHJl dHVybiBpc1JlbmRlcmVkKCkgJiYgbV9yZW5kZXJlZFJlY3QuY29udGFpbnMocG9pbnQpOyB9Ci0g ICAgdm9pZCBzZXRSZW5kZXJlZFJlY3QoY29uc3QgTGF5b3V0UmVjdCYgcikgeyBtX3JlbmRlcmVk UmVjdCA9IHI7IH0KLSAgICBjb25zdCBMYXlvdXRSZWN0JiByZW5kZXJlZFJlY3QoKSBjb25zdCB7 IHJldHVybiBtX3JlbmRlcmVkUmVjdDsgfQotICAgIHZvaWQgaW52YWxpZGF0ZShjb25zdCBMYXlv dXRSZWN0Jik7Ci0gICAgdm9pZCBpbnZhbGlkYXRlKCkgeyBtX3JlbmRlcmVkUmVjdCA9IGludmFs aWRNYXJrZXJSZWN0KCk7IH0KKyAgICBib29sIGNvbnRhaW5zKGNvbnN0IExheW91dFBvaW50JiBw b2ludCkgY29uc3QKKyAgICB7CisgICAgICAgIGZvciAoY29uc3QgYXV0byYgcmVjdCA6IG1fcmVu ZGVyZWRSZWN0cykgeworICAgICAgICAgICAgaWYgKHJlY3QuY29udGFpbnMocG9pbnQpKQorICAg ICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICB9CiAKLXByaXZhdGU6Ci0gICAgc3RhdGljIGNvbnN0IExheW91dFJlY3QmIGludmFs aWRNYXJrZXJSZWN0KCkKKyAgICB2b2lkIGFkZFJlbmRlcmVkUmVjdChjb25zdCBMYXlvdXRSZWN0 JiByKSB7IG1fcmVuZGVyZWRSZWN0cy5hcHBlbmQocik7IH0KKyAgICBjb25zdCBWZWN0b3I8TGF5 b3V0UmVjdCwgMT4mIHJlbmRlcmVkUmVjdHMoKSBjb25zdCB7IHJldHVybiBtX3JlbmRlcmVkUmVj dHM7IH0KKyAgICB2b2lkIGludmFsaWRhdGUoY29uc3QgTGF5b3V0UmVjdCYgcikKICAgICB7Ci0g ICAgICAgIHN0YXRpYyBjb25zdCBMYXlvdXRSZWN0IHJlY3QgPSBMYXlvdXRSZWN0KC0xLCAtMSwg LTEsIC0xKTsKLSAgICAgICAgcmV0dXJuIHJlY3Q7CisgICAgICAgIGZvciAoY29uc3QgYXV0byYg cmVjdCA6IG1fcmVuZGVyZWRSZWN0cykgeworICAgICAgICAgICAgaWYgKHJlY3QuaW50ZXJzZWN0 cyhyKSkgeworICAgICAgICAgICAgICAgIGludmFsaWRhdGUoKTsKKyAgICAgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgICAgICB9CisgICAgICAgIH0KICAgICB9CisgICAgdm9pZCBpbnZhbGlk YXRlKCkgeyBtX3JlbmRlcmVkUmVjdHMuY2xlYXIoKTsgfQogCi0gICAgTGF5b3V0UmVjdCBtX3Jl bmRlcmVkUmVjdDsKK3ByaXZhdGU6CisgICAgVmVjdG9yPExheW91dFJlY3QsIDE+IG1fcmVuZGVy ZWRSZWN0czsKIH07CiAKLWlubGluZSB2b2lkIFJlbmRlcmVkRG9jdW1lbnRNYXJrZXI6OmludmFs aWRhdGUoY29uc3QgTGF5b3V0UmVjdCYgcikKLXsKLSAgICBpZiAobV9yZW5kZXJlZFJlY3QuaW50 ZXJzZWN0cyhyKSkKLSAgICAgICAgaW52YWxpZGF0ZSgpOwotfQogCiB9IC8vIG5hbWVzcGFjZQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKaW5kZXggNDBiNGQy ZTM5OWNmNDA2Y2ViZTgzMTY5NmMyZGQzMjA0MWQ3Yzk0YS4uOWU2ZDJjZWMwZmQ0NTQzYTY3YWE3 OGZiYzJkNzFkMmRmODI0MGI4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0lubGluZVRleHRCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVU ZXh0Qm94LmNwcApAQCAtMTEwNCw3ICsxMTA0LDcgQEAgdm9pZCBJbmxpbmVUZXh0Qm94OjpwYWlu dERvY3VtZW50TWFya2VyKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgRmxvYXRQb2kK ICAgICAgICAgaWYgKGdyYW1tYXIgfHwgaXNEaWN0YXRpb25NYXJrZXIpIHsKICAgICAgICAgICAg IG1hcmtlclJlY3QubW92ZSgtYm94T3JpZ2luLngoKSwgLWJveE9yaWdpbi55KCkpOwogICAgICAg ICAgICAgbWFya2VyUmVjdCA9IHJlbmRlcmVyKCkubG9jYWxUb0Fic29sdXRlUXVhZChGbG9hdFJl Y3QobWFya2VyUmVjdCkpLmVuY2xvc2luZ0JvdW5kaW5nQm94KCk7Ci0gICAgICAgICAgICBtYXJr ZXIuc2V0UmVuZGVyZWRSZWN0KG1hcmtlclJlY3QpOworICAgICAgICAgICAgbWFya2VyLmFkZFJl bmRlcmVkUmVjdChtYXJrZXJSZWN0KTsKICAgICAgICAgfQogICAgIH0KICAgICAKQEAgLTExMzIs OCArMTEzMiw4IEBAIHZvaWQgSW5saW5lVGV4dEJveDo6cGFpbnRUZXh0TWF0Y2hNYXJrZXIoR3Jh cGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBGbG9hdFBvCiB7CiAgICAgTGF5b3V0VW5pdCBz ZWxlY3Rpb25IZWlnaHQgPSB0aGlzLT5zZWxlY3Rpb25IZWlnaHQoKTsKIAotICAgIGludCBzUG9z ID0gc3RkOjptYXgobWFya2VyLnN0YXJ0T2Zmc2V0KCkgLSBtX3N0YXJ0LCAodW5zaWduZWQpMCk7 Ci0gICAgaW50IGVQb3MgPSBzdGQ6Om1pbihtYXJrZXIuZW5kT2Zmc2V0KCkgLSBtX3N0YXJ0LCAo dW5zaWduZWQpbV9sZW4pOworICAgIGludCBzUG9zID0gc3RkOjptYXg8aW50PihtYXJrZXIuc3Rh cnRPZmZzZXQoKSAtIG1fc3RhcnQsIDApOworICAgIGludCBlUG9zID0gc3RkOjptaW48aW50Piht YXJrZXIuZW5kT2Zmc2V0KCkgLSBtX3N0YXJ0LCBtX2xlbik7CiAgICAgVGV4dFJ1biBydW4gPSBj b25zdHJ1Y3RUZXh0UnVuKHN0eWxlLCBmb250KTsKIAogICAgIC8vIEFsd2F5cyBjb21wdXRlIGFu ZCBzdG9yZSB0aGUgcmVjdCBhc3NvY2lhdGVkIHdpdGggdGhpcyBtYXJrZXIuIFRoZSBjb21wdXRl ZCByZWN0IGlzIGluIGFic29sdXRlIGNvb3JkaW5hdGVzLgpAQCAtMTE0Miw3ICsxMTQyLDcgQEAg dm9pZCBJbmxpbmVUZXh0Qm94OjpwYWludFRleHRNYXRjaE1hcmtlcihHcmFwaGljc0NvbnRleHQm IGNvbnRleHQsIGNvbnN0IEZsb2F0UG8KICAgICBmb250LmFkanVzdFNlbGVjdGlvblJlY3RGb3JU ZXh0KHJ1biwgcmVuZGVyZWRSZWN0LCBzUG9zLCBlUG9zKTsKICAgICBJbnRSZWN0IG1hcmtlclJl Y3QgPSBlbmNsb3NpbmdJbnRSZWN0KHJlbmRlcmVkUmVjdCk7CiAgICAgbWFya2VyUmVjdCA9IHJl bmRlcmVyKCkubG9jYWxUb0Fic29sdXRlUXVhZChGbG9hdFF1YWQobWFya2VyUmVjdCkpLmVuY2xv c2luZ0JvdW5kaW5nQm94KCk7Ci0gICAgbWFya2VyLnNldFJlbmRlcmVkUmVjdChtYXJrZXJSZWN0 KTsKKyAgICBtYXJrZXIuYWRkUmVuZGVyZWRSZWN0KG1hcmtlclJlY3QpOwogICAgIAogICAgIC8v IE9wdGlvbmFsbHkgaGlnaGxpZ2h0IHRoZSB0ZXh0CiAgICAgaWYgKHJlbmRlcmVyKCkuZnJhbWUo KS5lZGl0b3IoKS5tYXJrZWRUZXh0TWF0Y2hlc0FyZUhpZ2hsaWdodGVkKCkpIHsKQEAgLTExNzQs NyArMTE3NCw3IEBAIHZvaWQgSW5saW5lVGV4dEJveDo6Y29tcHV0ZVJlY3RGb3JSZXBsYWNlbWVu dE1hcmtlcihSZW5kZXJlZERvY3VtZW50TWFya2VyJiBtYXJrCiAgICAgZm9udC5hZGp1c3RTZWxl Y3Rpb25SZWN0Rm9yVGV4dChydW4sIHNlbGVjdGlvblJlY3QsIHNQb3MsIGVQb3MpOwogICAgIElu dFJlY3QgbWFya2VyUmVjdCA9IGVuY2xvc2luZ0ludFJlY3Qoc2VsZWN0aW9uUmVjdCk7CiAgICAg bWFya2VyUmVjdCA9IHJlbmRlcmVyKCkubG9jYWxUb0Fic29sdXRlUXVhZChGbG9hdFJlY3QobWFy a2VyUmVjdCkpLmVuY2xvc2luZ0JvdW5kaW5nQm94KCk7Ci0gICAgbWFya2VyLnNldFJlbmRlcmVk UmVjdChtYXJrZXJSZWN0KTsKKyAgICBtYXJrZXIuYWRkUmVuZGVyZWRSZWN0KG1hcmtlclJlY3Qp OwogfQogICAgIAogdm9pZCBJbmxpbmVUZXh0Qm94OjpwYWludERvY3VtZW50TWFya2VycyhHcmFw aGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZsb2F0UG9pbnQmIGJveE9yaWdpbiwgY29uc3Qg UmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBGb250Q2FzY2FkZSYgZm9udCwgYm9vbCBiYWNrZ3Jv dW5kKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVG bG93Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHSW5saW5lRmxvd0Jv eC5jcHAKaW5kZXggYWQzNDVmMGM5Y2ZlY2U0ZTRhMzc2NzE5NmY4NWI4YTQyMDAyNjMxMC4uZDFm NGM1YzNlYWY5ZjNiOTEyOGYzYzNiOTk3MzIzNzIwZjNlNmZiMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVGbG93Qm94LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR0lubGluZUZsb3dCb3guY3BwCkBAIC0xMjQsNyArMTI0 LDcgQEAgdm9pZCBTVkdJbmxpbmVGbG93Qm94Ojpjb21wdXRlVGV4dE1hdGNoTWFya2VyUmVjdEZv clJlbmRlcmVyKFJlbmRlclNWR0lubGluZVRleHQKICAgICAgICAgICAgIH0KICAgICAgICAgfQog Ci0gICAgICAgIG1hcmtlci0+c2V0UmVuZGVyZWRSZWN0KHRleHRSZW5kZXJlci0+bG9jYWxUb0Fi c29sdXRlUXVhZChtYXJrZXJSZWN0KS5lbmNsb3NpbmdCb3VuZGluZ0JveCgpKTsKKyAgICAgICAg bWFya2VyLT5hZGRSZW5kZXJlZFJlY3QodGV4dFJlbmRlcmVyLT5sb2NhbFRvQWJzb2x1dGVRdWFk KG1hcmtlclJlY3QpLmVuY2xvc2luZ0JvdW5kaW5nQm94KCkpOwogICAgIH0KIH0KIAo=