34186 2010-01-26 15:38:50 -0800 [chromium] complex text draws newlines as bells 2010-01-27 16:17:06 -0800 1 1 1 Unclassified WebKit Text 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 evan webkit-unassigned agl commit-queue oldest_to_newest 184794 0 evan 2010-01-26 15:38:50 -0800 http://code.google.com/p/chromium/issues/detail?id=33122 has a screenshot. It's because we don't filter out newlines before handing the text to Harfbuzz, and it thinks the bell is a good glyph for showing a newline. 184800 1 47454 evan 2010-01-26 15:52:31 -0800 Created attachment 47454 patch 184808 2 47455 evan 2010-01-26 16:05:00 -0800 Created attachment 47455 patch 185230 3 47455 evan 2010-01-27 15:01:02 -0800 Comment on attachment 47455 patch was waiting for agl to glance at this -- he says it looks fine, so it's ready for commit 185264 4 47455 commit-queue 2010-01-27 16:17:01 -0800 Comment on attachment 47455 patch Clearing flags on attachment: 47455 Committed r53958: <http://trac.webkit.org/changeset/53958> 185265 5 commit-queue 2010-01-27 16:17:06 -0800 All reviewed patches have been landed. Closing bug. 47454 2010-01-26 15:52:31 -0800 2010-01-26 16:04:57 -0800 patch bug-34186-20100126155231.patch text/plain 5547 evan ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Mjk2NDUzZC4uNDg0Yjg2YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wMS0yNiAgRXZhbiBNYXJ0aW4g IDxldmFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbY2hyb21pdW1dIGNvbXBsZXggdGV4dCBkcmF3cyBuZXdsaW5lcyBhcyBi ZWxscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQx ODYKKworICAgICAgICBSZXZlcnQgcjQ1NDk2IC0tIG9uY2Ugd2UndmUgZ290IGEgZ2x5cGggYXJy YXksIGl0IGlzIHRvbyBsYXRlIHRvIG5vcm1hbGl6ZQorICAgICAgICBiZWNhdXNlIHdlIGNvdWxk IGhhdmUgaGFkIG11bHRpcGxlIGNvZGVwb2ludHMgY29tYmluZSBpbnRvIG9uZSBnbHlwaC4gIFRo ZQorICAgICAgICBVbmlzY3JpYmUgY29kZSBpdCBtZW50aW9ucyBpdCdzIGR1cGxpY2F0aW5nIHVz ZXMgdGhlIGxvZyBjbHVzdGVyIG1hcCB0byBmaXgKKyAgICAgICAgdGhpcy4KKworICAgICAgICBJ bnN0ZWFkLCB3ZSBqdXN0IG5vcm1hbGl6ZSB0aGUgaW5wdXQgdGV4dCBpZiBpdCBjb250YWlucyBh bnkgbm9uLWFzY2lpLXNwYWNlCisgICAgICAgIHdoaXRlc3BhY2UuCisKKyAgICAgICAgVGhpcyBm aXhlcyBmYXN0L3RleHQvaW50ZXJuYXRpb25hbC9oaW5kaS13aGl0ZXNwYWNlLCB3aGljaCBjdXJy ZW50bHkgaGFzIGFuCisgICAgICAgIGluY29ycmVjdCBiYXNlbGluZSBjb250YWluaW5nIGEgc3F1 YXJlIGJveCBnbHlwaC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Zv bnRMaW51eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0UnVuV2Fsa2VyOjpnZXRUZXh0UnVu KToKKyAgICAgICAgKFdlYkNvcmU6OlRleHRSdW5XYWxrZXI6OmdldE5vcm1hbGl6ZWRUZXh0UnVu KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9IYXJmYnV6elNraWEuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6c3RyaW5nVG9HbHlwaHMpOgorCiAyMDEwLTAxLTIyICBKZXJl bXkgT3Jsb3cgIDxqb3Jsb3dAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERh cmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9Gb250TGludXguY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250 TGludXguY3BwCmluZGV4IGE0NTI2YTguLjk5OGY2ODUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udExpbnV4LmNwcAorKysgYi9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRMaW51eC5jcHAKQEAgLTMxMiw3ICszMTIsOCBAQCBw dWJsaWM6CiBwcml2YXRlOgogICAgIGNvbnN0IFRleHRSdW4mIGdldFRleHRSdW4oY29uc3QgVGV4 dFJ1biYgb3JpZ2luYWxSdW4pCiAgICAgewotICAgICAgICAvLyBDb252ZXJ0IHRoZSB8b3JpZ2lu YWxSdW58IHRvIE5GQyBub3JtYWxpemVkIGZvcm0gaWYgY29tYmluaW5nIGRpYWNyaXRpY2FsIG1h cmtzCisgICAgICAgIC8vIE5vcm1hbGl6ZSB0aGUgdGV4dCBydW4gaW4gdHdvIHdheXM6CisgICAg ICAgIC8vIDEpIENvbnZlcnQgdGhlIHxvcmlnaW5hbFJ1bnwgdG8gTkZDIG5vcm1hbGl6ZWQgZm9y bSBpZiBjb21iaW5pbmcgZGlhY3JpdGljYWwgbWFya3MKICAgICAgICAgLy8gKFUrMDMwMC4uKSBh cmUgdXNlZCBpbiB0aGUgcnVuLiBUaGlzIGNvbnZlcnNpb24gaXMgbmVjZXNzYXJ5IHNpbmNlIG1v c3QgT3BlblR5cGUKICAgICAgICAgLy8gZm9udHMgKGUuZy4sIEFyaWFsKSBkb24ndCBoYXZlIHN1 YnN0aXR1dGlvbiBydWxlcyBmb3IgdGhlIGRpYWNyaXRpY2FsIG1hcmtzIGluCiAgICAgICAgIC8v IHRoZWlyIEdTVUIgdGFibGVzLgpAQCAtMzIxLDkgKzMyMiwxMiBAQCBwcml2YXRlOgogICAgICAg ICAvLyB0aGUgQVBJIHJldHVybnMgRkFMU0UgKD0gbm90IG5vcm1hbGl6ZWQpIGZvciBjb21wbGV4 IHJ1bnMgdGhhdCBkb24ndCByZXF1aXJlIE5GQwogICAgICAgICAvLyBub3JtYWxpemF0aW9uIChl LmcuLCBBcmFiaWMgdGV4dCkuIFVubGVzcyB0aGUgcnVuIGNvbnRhaW5zIHRoZSBkaWFjcml0aWNh bCBtYXJrcywKICAgICAgICAgLy8gSGFyZmJ1enogd2lsbCBkbyB0aGUgc2FtZSB0aGluZyBmb3Ig dXMgdXNpbmcgdGhlIEdTVUIgdGFibGUuCisgICAgICAgIC8vIDIpIENvbnZlcnQgc3BhY2luZyBj aGFyYWN0ZXJzIGludG8gcGxhaW4gc3BhY2VzLCBhcyBzb21lIGZvbnRzIHdpbGwgcHJvdmlkZSBn bHlwaHMKKyAgICAgICAgLy8gZm9yIGNoYXJhY3RlcnMgbGlrZSAnXG4nIG90aGVyd2lzZS4KICAg ICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG9yaWdpbmFsUnVuLmxlbmd0aCgpOyArK2kp IHsKLSAgICAgICAgICAgIFVCbG9ja0NvZGUgYmxvY2sgPSA6OnVibG9ja19nZXRDb2RlKG9yaWdp bmFsUnVuW2ldKTsKLSAgICAgICAgICAgIGlmIChibG9jayA9PSBVQkxPQ0tfQ09NQklOSU5HX0RJ QUNSSVRJQ0FMX01BUktTKSB7CisgICAgICAgICAgICBVQ2hhciBjaCA9IG9yaWdpbmFsUnVuW2ld OworICAgICAgICAgICAgVUJsb2NrQ29kZSBibG9jayA9IDo6dWJsb2NrX2dldENvZGUoY2gpOwor ICAgICAgICAgICAgaWYgKGJsb2NrID09IFVCTE9DS19DT01CSU5JTkdfRElBQ1JJVElDQUxfTUFS S1MgfHwgKEZvbnQ6OnRyZWF0QXNTcGFjZShjaCkgJiYgY2ggIT0gJyAnKSkgewogICAgICAgICAg ICAgICAgIHJldHVybiBnZXROb3JtYWxpemVkVGV4dFJ1bihvcmlnaW5hbFJ1bik7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KQEAgLTM0MSw2ICszNDUsOSBAQCBwcml2YXRlOgogICAgICAgICBt X25vcm1hbGl6ZWRCdWZmZXIuc2V0KG5ldyBVQ2hhcltub3JtYWxpemVkU3RyaW5nLmxlbmd0aCgp ICsgMV0pOwogICAgICAgICBub3JtYWxpemVkU3RyaW5nLmV4dHJhY3QobV9ub3JtYWxpemVkQnVm ZmVyLmdldCgpLCBub3JtYWxpemVkU3RyaW5nLmxlbmd0aCgpICsgMSwgZXJyb3IpOwogICAgICAg ICBBU1NFUlQoVV9TVUNDRVNTKGVycm9yKSk7CisgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7 IGkgPCBub3JtYWxpemVkU3RyaW5nLmxlbmd0aCgpOyArK2kpCisgICAgICAgICAgICBpZiAoRm9u dDo6dHJlYXRBc1NwYWNlKG1fbm9ybWFsaXplZEJ1ZmZlcltpXSkpCisgICAgICAgICAgICAgICAg bV9ub3JtYWxpemVkQnVmZmVyW2ldID0gJyAnOwogCiAgICAgICAgIG1fbm9ybWFsaXplZFJ1bi5z ZXQobmV3IFRleHRSdW4ob3JpZ2luYWxSdW4pKTsKICAgICAgICAgbV9ub3JtYWxpemVkUnVuLT5z ZXRUZXh0KG1fbm9ybWFsaXplZEJ1ZmZlci5nZXQoKSwgbm9ybWFsaXplZFN0cmluZy5sZW5ndGgo KSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0hhcmZi dXp6U2tpYS5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0hhcmZidXp6 U2tpYS5jcHAKaW5kZXggNjIxZDY3NC4uOWZkMDllMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9IYXJmYnV6elNraWEuY3BwCisrKyBiL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSGFyZmJ1enpTa2lhLmNwcApAQCAtMzAsNyArMzAsNiBA QAogCiAjaW5jbHVkZSAiY29uZmlnLmgiCiAKLSNpbmNsdWRlICJGb250LmgiCiAjaW5jbHVkZSAi Rm9udFBsYXRmb3JtRGF0YS5oIgogI2luY2x1ZGUgInd0Zi9Pd25BcnJheVB0ci5oIgogCkBAIC00 Miw3ICs0MSw2IEBACiAKIGV4dGVybiAiQyIgewogI2luY2x1ZGUgImhhcmZidXp6LXNoYXBlci5o IgotI2luY2x1ZGUgImhhcmZidXp6LXVuaWNvZGUuaCIKIH0KIAogLy8gVGhpcyBmaWxlIGltcGxl bWVudHMgdGhlIGNhbGxiYWNrcyB3aGljaCBIYXJmYnV6eiByZXF1aXJlcyBieSB1c2luZyBTa2lh CkBAIC02NywyOSArNjUsMTAgQEAgc3RhdGljIEhCX0Jvb2wgc3RyaW5nVG9HbHlwaHMoSEJfRm9u dCBoYkZvbnQsIGNvbnN0IEhCX1VDaGFyMTYqIGNoYXJhY3RlcnMsIGhiX3UKIAogICAgIC8vIEhC X0dseXBoIGlzIDMyLWJpdCwgYnV0IFNraWEgb3V0cHV0cyBvbmx5IDE2LWJpdCBudW1iZXJzLiBT byBvdXIKICAgICAvLyB8Z2x5cGhzfCBhcnJheSBuZWVkcyB0byBiZSBjb252ZXJ0ZWQuCi0gICAg Ly8gQWRkaXRpb25hbGx5LCBpZiB0aGUgQ1NTIHdoaXRlLXNwYWNlIHByb3BlcnR5IGlzIGluaGli aXRpbmcgbGluZQotICAgIC8vIGJyZWFraW5nLCB3ZSBtaWdodCBmaW5kIGVuZC1vZi1saW5lIGNo YXJhY3RvcnMgcmVuZGVyZWQgdmlhIHRoZSBjb21wbGV4Ci0gICAgLy8gdGV4dCBwYXRoLiBGb250 cyBkb24ndCBwcm92aWRlIGdseXBocyBmb3IgdGhlc2UgY29kZSBwb2ludHMgc28sIGlmIHdlCi0g ICAgLy8gZmluZCBvbmUsIHdlIHNpbXVsYXRlIHRoZSBzcGFjZSBnbHlwaCBiZWluZyBpbnRlcnBv c2VkIGluIHRoaXMgY2FzZS4KLSAgICAvLyBCZWNhdXNlIHRoZSBpbnB1dCBpcyB2YXJpYWJsZS1s ZW5ndGggcGVyIGNvZGUgcG9pbnQsIHdlIHdhbGsgdGhlIGlucHV0Ci0gICAgLy8gaW4gc3RlcCB3 aXRoIHRoZSBvdXRwdXQuCi0gICAgLy8gRklYTUU6IGl0IHNlZW1zIHRoYXQgdGhpcyBsb2dpYyBp cyBkdXBsaWNhdGVkIGluIENvcmVUZXh0Q29udHJvbGxlciBhbmQgVW5pc2NyaWJlQ29udHJvbGxl cgotICAgIHNzaXplX3QgaW5kZXhPZk5leHRDb2RlUG9pbnQgPSAwOwotICAgIHVpbnQxNl90IHNw YWNlR2x5cGhOdW1iZXIgPSAwOwogICAgIGZvciAoaW50IGkgPSBudW1HbHlwaHMgLSAxOyBpID49 IDA7IC0taSkgewotICAgICAgICBjb25zdCB1aW50MzJfdCBjdXJyZW50Q29kZVBvaW50ID0gdXRm MTZfdG9fY29kZV9wb2ludChjaGFyYWN0ZXJzLCBsZW5ndGgsICZpbmRleE9mTmV4dENvZGVQb2lu dCk7Ci0KICAgICAgICAgdWludDE2X3QgdmFsdWU7CiAgICAgICAgIC8vIFdlIHVzZSBhIG1lbWNw eSB0byBhdm9pZCBicmVha2luZyBzdHJpY3QgYWxpYXNpbmcgcnVsZXMuCiAgICAgICAgIG1lbWNw eSgmdmFsdWUsIHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KGdseXBocykgKyBzaXplb2YodWludDE2 X3QpICogaSwgc2l6ZW9mKHVpbnQxNl90KSk7Ci0KLSAgICAgICAgaWYgKCF2YWx1ZSAmJiBGb250 Ojp0cmVhdEFzU3BhY2UoY3VycmVudENvZGVQb2ludCkpIHsKLSAgICAgICAgICAgIHN0YXRpYyBj b25zdCB1aW50MTZfdCBzcGFjZVVURjE2ID0gJyAnOwotICAgICAgICAgICAgaWYgKCFzcGFjZUds eXBoTnVtYmVyKQotICAgICAgICAgICAgICAgIHBhaW50LnRleHRUb0dseXBocygmc3BhY2VVVEYx Niwgc2l6ZW9mKHNwYWNlVVRGMTYpLCAmc3BhY2VHbHlwaE51bWJlcik7Ci0gICAgICAgICAgICB2 YWx1ZSA9IHNwYWNlR2x5cGhOdW1iZXI7Ci0gICAgICAgIH0KLQogICAgICAgICBnbHlwaHNbaV0g PSB2YWx1ZTsKICAgICB9CiAK 47455 2010-01-26 16:05:00 -0800 2010-01-27 16:17:00 -0800 patch bug-34186-20100126160500.patch text/plain 5522 evan ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Mjk2NDUzZC4uNDg0Yjg2YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wMS0yNiAgRXZhbiBNYXJ0aW4g IDxldmFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbY2hyb21pdW1dIGNvbXBsZXggdGV4dCBkcmF3cyBuZXdsaW5lcyBhcyBi ZWxscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQx ODYKKworICAgICAgICBSZXZlcnQgcjQ1NDk2IC0tIG9uY2Ugd2UndmUgZ290IGEgZ2x5cGggYXJy YXksIGl0IGlzIHRvbyBsYXRlIHRvIG5vcm1hbGl6ZQorICAgICAgICBiZWNhdXNlIHdlIGNvdWxk IGhhdmUgaGFkIG11bHRpcGxlIGNvZGVwb2ludHMgY29tYmluZSBpbnRvIG9uZSBnbHlwaC4gIFRo ZQorICAgICAgICBVbmlzY3JpYmUgY29kZSBpdCBtZW50aW9ucyBpdCdzIGR1cGxpY2F0aW5nIHVz ZXMgdGhlIGxvZyBjbHVzdGVyIG1hcCB0byBmaXgKKyAgICAgICAgdGhpcy4KKworICAgICAgICBJ bnN0ZWFkLCB3ZSBqdXN0IG5vcm1hbGl6ZSB0aGUgaW5wdXQgdGV4dCBpZiBpdCBjb250YWlucyBh bnkgbm9uLWFzY2lpLXNwYWNlCisgICAgICAgIHdoaXRlc3BhY2UuCisKKyAgICAgICAgVGhpcyBm aXhlcyBmYXN0L3RleHQvaW50ZXJuYXRpb25hbC9oaW5kaS13aGl0ZXNwYWNlLCB3aGljaCBjdXJy ZW50bHkgaGFzIGFuCisgICAgICAgIGluY29ycmVjdCBiYXNlbGluZSBjb250YWluaW5nIGEgc3F1 YXJlIGJveCBnbHlwaC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Zv bnRMaW51eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0UnVuV2Fsa2VyOjpnZXRUZXh0UnVu KToKKyAgICAgICAgKFdlYkNvcmU6OlRleHRSdW5XYWxrZXI6OmdldE5vcm1hbGl6ZWRUZXh0UnVu KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9IYXJmYnV6elNraWEuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6c3RyaW5nVG9HbHlwaHMpOgorCiAyMDEwLTAxLTIyICBKZXJl bXkgT3Jsb3cgIDxqb3Jsb3dAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERh cmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9Gb250TGludXguY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250 TGludXguY3BwCmluZGV4IGE0NTI2YTguLjAyNTQzNjYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udExpbnV4LmNwcAorKysgYi9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRMaW51eC5jcHAKQEAgLTMxMiw3ICszMTIsOCBAQCBw dWJsaWM6CiBwcml2YXRlOgogICAgIGNvbnN0IFRleHRSdW4mIGdldFRleHRSdW4oY29uc3QgVGV4 dFJ1biYgb3JpZ2luYWxSdW4pCiAgICAgewotICAgICAgICAvLyBDb252ZXJ0IHRoZSB8b3JpZ2lu YWxSdW58IHRvIE5GQyBub3JtYWxpemVkIGZvcm0gaWYgY29tYmluaW5nIGRpYWNyaXRpY2FsIG1h cmtzCisgICAgICAgIC8vIE5vcm1hbGl6ZSB0aGUgdGV4dCBydW4gaW4gdHdvIHdheXM6CisgICAg ICAgIC8vIDEpIENvbnZlcnQgdGhlIHxvcmlnaW5hbFJ1bnwgdG8gTkZDIG5vcm1hbGl6ZWQgZm9y bSBpZiBjb21iaW5pbmcgZGlhY3JpdGljYWwgbWFya3MKICAgICAgICAgLy8gKFUrMDMwMC4uKSBh cmUgdXNlZCBpbiB0aGUgcnVuLiBUaGlzIGNvbnZlcnNpb24gaXMgbmVjZXNzYXJ5IHNpbmNlIG1v c3QgT3BlblR5cGUKICAgICAgICAgLy8gZm9udHMgKGUuZy4sIEFyaWFsKSBkb24ndCBoYXZlIHN1 YnN0aXR1dGlvbiBydWxlcyBmb3IgdGhlIGRpYWNyaXRpY2FsIG1hcmtzIGluCiAgICAgICAgIC8v IHRoZWlyIEdTVUIgdGFibGVzLgpAQCAtMzIxLDkgKzMyMiwxMiBAQCBwcml2YXRlOgogICAgICAg ICAvLyB0aGUgQVBJIHJldHVybnMgRkFMU0UgKD0gbm90IG5vcm1hbGl6ZWQpIGZvciBjb21wbGV4 IHJ1bnMgdGhhdCBkb24ndCByZXF1aXJlIE5GQwogICAgICAgICAvLyBub3JtYWxpemF0aW9uIChl LmcuLCBBcmFiaWMgdGV4dCkuIFVubGVzcyB0aGUgcnVuIGNvbnRhaW5zIHRoZSBkaWFjcml0aWNh bCBtYXJrcywKICAgICAgICAgLy8gSGFyZmJ1enogd2lsbCBkbyB0aGUgc2FtZSB0aGluZyBmb3Ig dXMgdXNpbmcgdGhlIEdTVUIgdGFibGUuCisgICAgICAgIC8vIDIpIENvbnZlcnQgc3BhY2luZyBj aGFyYWN0ZXJzIGludG8gcGxhaW4gc3BhY2VzLCBhcyBzb21lIGZvbnRzIHdpbGwgcHJvdmlkZSBn bHlwaHMKKyAgICAgICAgLy8gZm9yIGNoYXJhY3RlcnMgbGlrZSAnXG4nIG90aGVyd2lzZS4KICAg ICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG9yaWdpbmFsUnVuLmxlbmd0aCgpOyArK2kp IHsKLSAgICAgICAgICAgIFVCbG9ja0NvZGUgYmxvY2sgPSA6OnVibG9ja19nZXRDb2RlKG9yaWdp bmFsUnVuW2ldKTsKLSAgICAgICAgICAgIGlmIChibG9jayA9PSBVQkxPQ0tfQ09NQklOSU5HX0RJ QUNSSVRJQ0FMX01BUktTKSB7CisgICAgICAgICAgICBVQ2hhciBjaCA9IG9yaWdpbmFsUnVuW2ld OworICAgICAgICAgICAgVUJsb2NrQ29kZSBibG9jayA9IDo6dWJsb2NrX2dldENvZGUoY2gpOwor ICAgICAgICAgICAgaWYgKGJsb2NrID09IFVCTE9DS19DT01CSU5JTkdfRElBQ1JJVElDQUxfTUFS S1MgfHwgKEZvbnQ6OnRyZWF0QXNTcGFjZShjaCkgJiYgY2ggIT0gJyAnKSkgewogICAgICAgICAg ICAgICAgIHJldHVybiBnZXROb3JtYWxpemVkVGV4dFJ1bihvcmlnaW5hbFJ1bik7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KQEAgLTM0Miw2ICszNDYsMTEgQEAgcHJpdmF0ZToKICAgICAgICAg bm9ybWFsaXplZFN0cmluZy5leHRyYWN0KG1fbm9ybWFsaXplZEJ1ZmZlci5nZXQoKSwgbm9ybWFs aXplZFN0cmluZy5sZW5ndGgoKSArIDEsIGVycm9yKTsKICAgICAgICAgQVNTRVJUKFVfU1VDQ0VT UyhlcnJvcikpOwogCisgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBub3JtYWxpemVk U3RyaW5nLmxlbmd0aCgpOyArK2kpIHsKKyAgICAgICAgICAgIGlmIChGb250Ojp0cmVhdEFzU3Bh Y2UobV9ub3JtYWxpemVkQnVmZmVyW2ldKSkKKyAgICAgICAgICAgICAgICBtX25vcm1hbGl6ZWRC dWZmZXJbaV0gPSAnICc7CisgICAgICAgIH0KKwogICAgICAgICBtX25vcm1hbGl6ZWRSdW4uc2V0 KG5ldyBUZXh0UnVuKG9yaWdpbmFsUnVuKSk7CiAgICAgICAgIG1fbm9ybWFsaXplZFJ1bi0+c2V0 VGV4dChtX25vcm1hbGl6ZWRCdWZmZXIuZ2V0KCksIG5vcm1hbGl6ZWRTdHJpbmcubGVuZ3RoKCkp OwogICAgICAgICByZXR1cm4gKm1fbm9ybWFsaXplZFJ1bjsKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSGFyZmJ1enpTa2lhLmNwcCBiL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSGFyZmJ1enpTa2lhLmNwcAppbmRleCA2MjFkNjc0Li45 ZmQwOWUxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0hh cmZidXp6U2tpYS5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9I YXJmYnV6elNraWEuY3BwCkBAIC0zMCw3ICszMCw2IEBACiAKICNpbmNsdWRlICJjb25maWcuaCIK IAotI2luY2x1ZGUgIkZvbnQuaCIKICNpbmNsdWRlICJGb250UGxhdGZvcm1EYXRhLmgiCiAjaW5j bHVkZSAid3RmL093bkFycmF5UHRyLmgiCiAKQEAgLTQyLDcgKzQxLDYgQEAKIAogZXh0ZXJuICJD IiB7CiAjaW5jbHVkZSAiaGFyZmJ1enotc2hhcGVyLmgiCi0jaW5jbHVkZSAiaGFyZmJ1enotdW5p Y29kZS5oIgogfQogCiAvLyBUaGlzIGZpbGUgaW1wbGVtZW50cyB0aGUgY2FsbGJhY2tzIHdoaWNo IEhhcmZidXp6IHJlcXVpcmVzIGJ5IHVzaW5nIFNraWEKQEAgLTY3LDI5ICs2NSwxMCBAQCBzdGF0 aWMgSEJfQm9vbCBzdHJpbmdUb0dseXBocyhIQl9Gb250IGhiRm9udCwgY29uc3QgSEJfVUNoYXIx NiogY2hhcmFjdGVycywgaGJfdQogCiAgICAgLy8gSEJfR2x5cGggaXMgMzItYml0LCBidXQgU2tp YSBvdXRwdXRzIG9ubHkgMTYtYml0IG51bWJlcnMuIFNvIG91cgogICAgIC8vIHxnbHlwaHN8IGFy cmF5IG5lZWRzIHRvIGJlIGNvbnZlcnRlZC4KLSAgICAvLyBBZGRpdGlvbmFsbHksIGlmIHRoZSBD U1Mgd2hpdGUtc3BhY2UgcHJvcGVydHkgaXMgaW5oaWJpdGluZyBsaW5lCi0gICAgLy8gYnJlYWtp bmcsIHdlIG1pZ2h0IGZpbmQgZW5kLW9mLWxpbmUgY2hhcmFjdG9ycyByZW5kZXJlZCB2aWEgdGhl IGNvbXBsZXgKLSAgICAvLyB0ZXh0IHBhdGguIEZvbnRzIGRvbid0IHByb3ZpZGUgZ2x5cGhzIGZv ciB0aGVzZSBjb2RlIHBvaW50cyBzbywgaWYgd2UKLSAgICAvLyBmaW5kIG9uZSwgd2Ugc2ltdWxh dGUgdGhlIHNwYWNlIGdseXBoIGJlaW5nIGludGVycG9zZWQgaW4gdGhpcyBjYXNlLgotICAgIC8v IEJlY2F1c2UgdGhlIGlucHV0IGlzIHZhcmlhYmxlLWxlbmd0aCBwZXIgY29kZSBwb2ludCwgd2Ug d2FsayB0aGUgaW5wdXQKLSAgICAvLyBpbiBzdGVwIHdpdGggdGhlIG91dHB1dC4KLSAgICAvLyBG SVhNRTogaXQgc2VlbXMgdGhhdCB0aGlzIGxvZ2ljIGlzIGR1cGxpY2F0ZWQgaW4gQ29yZVRleHRD b250cm9sbGVyIGFuZCBVbmlzY3JpYmVDb250cm9sbGVyCi0gICAgc3NpemVfdCBpbmRleE9mTmV4 dENvZGVQb2ludCA9IDA7Ci0gICAgdWludDE2X3Qgc3BhY2VHbHlwaE51bWJlciA9IDA7CiAgICAg Zm9yIChpbnQgaSA9IG51bUdseXBocyAtIDE7IGkgPj0gMDsgLS1pKSB7Ci0gICAgICAgIGNvbnN0 IHVpbnQzMl90IGN1cnJlbnRDb2RlUG9pbnQgPSB1dGYxNl90b19jb2RlX3BvaW50KGNoYXJhY3Rl cnMsIGxlbmd0aCwgJmluZGV4T2ZOZXh0Q29kZVBvaW50KTsKLQogICAgICAgICB1aW50MTZfdCB2 YWx1ZTsKICAgICAgICAgLy8gV2UgdXNlIGEgbWVtY3B5IHRvIGF2b2lkIGJyZWFraW5nIHN0cmlj dCBhbGlhc2luZyBydWxlcy4KICAgICAgICAgbWVtY3B5KCZ2YWx1ZSwgcmVpbnRlcnByZXRfY2Fz dDxjaGFyKj4oZ2x5cGhzKSArIHNpemVvZih1aW50MTZfdCkgKiBpLCBzaXplb2YodWludDE2X3Qp KTsKLQotICAgICAgICBpZiAoIXZhbHVlICYmIEZvbnQ6OnRyZWF0QXNTcGFjZShjdXJyZW50Q29k ZVBvaW50KSkgewotICAgICAgICAgICAgc3RhdGljIGNvbnN0IHVpbnQxNl90IHNwYWNlVVRGMTYg PSAnICc7Ci0gICAgICAgICAgICBpZiAoIXNwYWNlR2x5cGhOdW1iZXIpCi0gICAgICAgICAgICAg ICAgcGFpbnQudGV4dFRvR2x5cGhzKCZzcGFjZVVURjE2LCBzaXplb2Yoc3BhY2VVVEYxNiksICZz cGFjZUdseXBoTnVtYmVyKTsKLSAgICAgICAgICAgIHZhbHVlID0gc3BhY2VHbHlwaE51bWJlcjsK LSAgICAgICAgfQotCiAgICAgICAgIGdseXBoc1tpXSA9IHZhbHVlOwogICAgIH0KIAo=