117617 2013-06-13 16:46:50 -0700 CSSParser::parseImageSet() doesn't need a parameter. 2013-06-14 09:37:02 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 ljaehun.lim webkit-unassigned commit-queue esprehn+autocc glenn macpherson menard oldest_to_newest 900327 0 ljaehun.lim 2013-06-13 16:46:50 -0700 parseImageSet() can get m_valueList directly. And minor fixes. 900328 1 204653 ljaehun.lim 2013-06-13 16:49:31 -0700 Created attachment 204653 Patch 900342 2 204653 darin 2013-06-13 17:56:34 -0700 Comment on attachment 204653 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204653&action=review > Source/WebCore/css/CSSParser.cpp:8028 > + ASSERT(value->unit == CSSParserValue::Function && value->function); We never use && in an ASSERT. Instead use two separate assertions so you can see which failed. ASSERT(value->unit == CSSParserValue::Function); ASSERT(value->function); But also, I don’t think that ASSERT(value->function) is all that useful. We’ll see the null dereference right after this, it won’t be hard to debug. And there’s no reason to expect a null here. > Source/WebCore/css/CSSParser.cpp:8042 > RefPtr<CSSImageValue> image = CSSImageValue::create(completeURL(arg->string)); > - imageSet->append(image); > + imageSet->append(image.release()); Why use a local variable at all? I think this is better in a single line. 900365 3 204653 ljaehun.lim 2013-06-13 19:26:28 -0700 Comment on attachment 204653 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204653&action=review Thanks for your review. >> Source/WebCore/css/CSSParser.cpp:8028 >> + ASSERT(value->unit == CSSParserValue::Function && value->function); > > We never use && in an ASSERT. Instead use two separate assertions so you can see which failed. > > ASSERT(value->unit == CSSParserValue::Function); > ASSERT(value->function); > > But also, I don’t think that ASSERT(value->function) is all that useful. We’ll see the null dereference right after this, it won’t be hard to debug. And there’s no reason to expect a null here. I'll remove 'value->function' >> Source/WebCore/css/CSSParser.cpp:8042 >> + imageSet->append(image.release()); > > Why use a local variable at all? I think this is better in a single line. I'll make it one line. 900366 4 204664 ljaehun.lim 2013-06-13 19:31:18 -0700 Created attachment 204664 Patch 900586 5 204664 commit-queue 2013-06-14 09:37:00 -0700 Comment on attachment 204664 Patch Clearing flags on attachment: 204664 Committed r151597: <http://trac.webkit.org/changeset/151597> 900587 6 commit-queue 2013-06-14 09:37:02 -0700 All reviewed patches have been landed. Closing bug. 204653 2013-06-13 16:49:31 -0700 2013-06-13 19:31:11 -0700 Patch bug-117617-20130614084748.patch text/plain 5218 ljaehun.lim U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWY0MGQ3MTI5ODRjYjg5 OTBkMjlmMWE0Yjg5OTY2ZjcwODdkNzJkNi4uM2I1MzM3MmZlMjNmYWQyMGU4MDlkYjFhYTc0NjBh ZGZiNWI3YWY1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA2LTEzICBKYWVo dW4gTGltICA8bGphZWh1bi5saW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgQ1NTUGFyc2VyOjpw YXJzZUltYWdlU2V0KCkgZG9lc24ndCBuZWVkIGEgcGFyYW1ldGVyLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3NjE3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgcGFyc2VJbWFnZVNldCgpIGNhbiBnZXQg bV92YWx1ZUxpc3QgZGlyZWN0bHkuCisgICAgICAgIEFuZCBtaW5vciBmaXhlcy4KKworICAgICAg ICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGNzcy9DU1NQ YXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpwYXJzZVZhbHVlKToKKyAg ICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cGFyc2VDb250ZW50KToKKyAgICAgICAgKFdlYkNv cmU6OkNTU1BhcnNlcjo6cGFyc2VGaWxsSW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFy c2VyOjpwYXJzZUJvcmRlckltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cGFy c2VJbWFnZVNldCk6CisgICAgICAgICogY3NzL0NTU1BhcnNlci5oOgorCiAyMDEzLTA2LTEzICBB bmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIE5vZGU6OnNo b3VsZFVzZUlucHV0TWV0aG9kKCkgdG8gRWxlbWVudC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAK aW5kZXggNjZkZDVjZjAzZjVmZDJlN2M2OGZlYjMyMDk5OGE1ZjYzYTkyZGZkOS4uMjVlMjQ3MjRj NzY2MmIyOWEyYzRmZTViNWU4MDk0M2Q0NTVmMDAyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvY3NzL0NTU1BhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5j cHAKQEAgLTIwMzIsNyArMjAzMiw3IEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZVZhbHVlKENTU1By b3BlcnR5SUQgcHJvcElkLCBib29sIGltcG9ydGFudCkKICAgICAgICAgICAgICAgICAgICAgaW1h Z2UgPSBDU1NJbWFnZVZhbHVlOjpjcmVhdGUoY29tcGxldGVVUkwodXJpKSk7CiAjaWYgRU5BQkxF KENTU19JTUFHRV9TRVQpICYmIEVOQUJMRShNT1VTRV9DVVJTT1JfU0NBTEUpCiAgICAgICAgICAg ICB9IGVsc2UgaWYgKHZhbHVlLT51bml0ID09IENTU1BhcnNlclZhbHVlOjpGdW5jdGlvbiAmJiBl cXVhbElnbm9yaW5nQ2FzZSh2YWx1ZS0+ZnVuY3Rpb24tPm5hbWUsICItd2Via2l0LWltYWdlLXNl dCgiKSkgewotICAgICAgICAgICAgICAgIGltYWdlID0gcGFyc2VJbWFnZVNldChtX3ZhbHVlTGlz dC5nZXQoKSk7CisgICAgICAgICAgICAgICAgaW1hZ2UgPSBwYXJzZUltYWdlU2V0KCk7CiAgICAg ICAgICAgICAgICAgaWYgKCFpbWFnZSkKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAjZW5k aWYKQEAgLTIxNjQsNyArMjE2NCw3IEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZVZhbHVlKENTU1By b3BlcnR5SUQgcHJvcElkLCBib29sIGltcG9ydGFudCkKICAgICAgICAgfQogI2lmIEVOQUJMRShD U1NfSU1BR0VfU0VUKQogICAgICAgICBlbHNlIGlmICh2YWx1ZS0+dW5pdCA9PSBDU1NQYXJzZXJW YWx1ZTo6RnVuY3Rpb24gJiYgZXF1YWxJZ25vcmluZ0Nhc2UodmFsdWUtPmZ1bmN0aW9uLT5uYW1l LCAiLXdlYmtpdC1pbWFnZS1zZXQoIikpIHsKLSAgICAgICAgICAgIHBhcnNlZFZhbHVlID0gcGFy c2VJbWFnZVNldChtX3ZhbHVlTGlzdC5nZXQoKSk7CisgICAgICAgICAgICBwYXJzZWRWYWx1ZSA9 IHBhcnNlSW1hZ2VTZXQoKTsKICAgICAgICAgICAgIGlmICghcGFyc2VkVmFsdWUpCiAgICAgICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgbV92YWx1ZUxpc3QtPm5leHQoKTsK QEAgLTM3MzcsNyArMzczNyw3IEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZUNvbnRlbnQoQ1NTUHJv cGVydHlJRCBwcm9wSWQsIGJvb2wgaW1wb3J0YW50KQogICAgICAgICAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CiAjaWYgRU5BQkxFKENTU19JTUFHRV9TRVQpCiAgICAgICAgICAgICB9IGVsc2Ug aWYgKGVxdWFsSWdub3JpbmdDYXNlKHZhbC0+ZnVuY3Rpb24tPm5hbWUsICItd2Via2l0LWltYWdl LXNldCgiKSkgewotICAgICAgICAgICAgICAgIHBhcnNlZFZhbHVlID0gcGFyc2VJbWFnZVNldCht X3ZhbHVlTGlzdC5nZXQoKSk7CisgICAgICAgICAgICAgICAgcGFyc2VkVmFsdWUgPSBwYXJzZUlt YWdlU2V0KCk7CiAgICAgICAgICAgICAgICAgaWYgKCFwYXJzZWRWYWx1ZSkKICAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwogI2VuZGlmCkBAIC0zODMwLDcgKzM4MzAsNyBAQCBib29s IENTU1BhcnNlcjo6cGFyc2VGaWxsSW1hZ2UoQ1NTUGFyc2VyVmFsdWVMaXN0KiB2YWx1ZUxpc3Qs IFJlZlB0cjxDU1NWYWx1ZT4mCiAgICAgCiAjaWYgRU5BQkxFKENTU19JTUFHRV9TRVQpCiAgICAg aWYgKHZhbHVlTGlzdC0+Y3VycmVudCgpLT51bml0ID09IENTU1BhcnNlclZhbHVlOjpGdW5jdGlv biAmJiBlcXVhbElnbm9yaW5nQ2FzZSh2YWx1ZUxpc3QtPmN1cnJlbnQoKS0+ZnVuY3Rpb24tPm5h bWUsICItd2Via2l0LWltYWdlLXNldCgiKSkgewotICAgICAgICB2YWx1ZSA9IHBhcnNlSW1hZ2VT ZXQobV92YWx1ZUxpc3QuZ2V0KCkpOworICAgICAgICB2YWx1ZSA9IHBhcnNlSW1hZ2VTZXQoKTsK ICAgICAgICAgaWYgKHZhbHVlKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQpAQCAt NjczNyw3ICs2NzM3LDcgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlQm9yZGVySW1hZ2UoQ1NTUHJv cGVydHlJRCBwcm9wSWQsIFJlZlB0cjxDU1NWYWx1ZT4mIHJlc3VsdCwKICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogI2lmIEVOQUJMRShDU1NfSU1BR0VfU0VUKQogICAgICAgICAg ICAgfSBlbHNlIGlmICh2YWwtPnVuaXQgPT0gQ1NTUGFyc2VyVmFsdWU6OkZ1bmN0aW9uICYmIGVx dWFsSWdub3JpbmdDYXNlKHZhbC0+ZnVuY3Rpb24tPm5hbWUsICItd2Via2l0LWltYWdlLXNldCgi KSkgewotICAgICAgICAgICAgICAgIFJlZlB0cjxDU1NWYWx1ZT4gdmFsdWUgPSBwYXJzZUltYWdl U2V0KG1fdmFsdWVMaXN0LmdldCgpKTsKKyAgICAgICAgICAgICAgICBSZWZQdHI8Q1NTVmFsdWU+ IHZhbHVlID0gcGFyc2VJbWFnZVNldCgpOwogICAgICAgICAgICAgICAgIGlmICh2YWx1ZSkKICAg ICAgICAgICAgICAgICAgICAgY29udGV4dC5jb21taXRJbWFnZSh2YWx1ZS5yZWxlYXNlKCkpOwog ICAgICAgICAgICAgICAgIGVsc2UKQEAgLTgwMjIsMTQgKzgwMjIsMTIgQEAgUGFzc1JlZlB0cjxD U1NWYWx1ZT4gQ1NTUGFyc2VyOjpwYXJzZUltYWdlUmVzb2x1dGlvbigpCiAjZW5kaWYKIAogI2lm IEVOQUJMRShDU1NfSU1BR0VfU0VUKQotUGFzc1JlZlB0cjxDU1NWYWx1ZT4gQ1NTUGFyc2VyOjpw YXJzZUltYWdlU2V0KENTU1BhcnNlclZhbHVlTGlzdCogdmFsdWVMaXN0KQorUGFzc1JlZlB0cjxD U1NWYWx1ZT4gQ1NTUGFyc2VyOjpwYXJzZUltYWdlU2V0KCkKIHsKLSAgICBDU1NQYXJzZXJWYWx1 ZSogZnVuY3Rpb24gPSB2YWx1ZUxpc3QtPmN1cnJlbnQoKTsKLQotICAgIGlmIChmdW5jdGlvbi0+ dW5pdCAhPSBDU1NQYXJzZXJWYWx1ZTo6RnVuY3Rpb24pCi0gICAgICAgIHJldHVybiAwOworICAg IENTU1BhcnNlclZhbHVlKiB2YWx1ZSA9IG1fdmFsdWVMaXN0LT5jdXJyZW50KCk7CisgICAgQVNT RVJUKHZhbHVlLT51bml0ID09IENTU1BhcnNlclZhbHVlOjpGdW5jdGlvbiAmJiB2YWx1ZS0+ZnVu Y3Rpb24pOwogCi0gICAgQ1NTUGFyc2VyVmFsdWVMaXN0KiBmdW5jdGlvbkFyZ3MgPSB2YWx1ZUxp c3QtPmN1cnJlbnQoKS0+ZnVuY3Rpb24tPmFyZ3MuZ2V0KCk7CisgICAgQ1NTUGFyc2VyVmFsdWVM aXN0KiBmdW5jdGlvbkFyZ3MgPSB2YWx1ZS0+ZnVuY3Rpb24tPmFyZ3MuZ2V0KCk7CiAgICAgaWYg KCFmdW5jdGlvbkFyZ3MgfHwgIWZ1bmN0aW9uQXJncy0+c2l6ZSgpIHx8ICFmdW5jdGlvbkFyZ3Mt PmN1cnJlbnQoKSkKICAgICAgICAgcmV0dXJuIDA7CiAKQEAgLTgwNDEsNyArODAzOSw3IEBAIFBh c3NSZWZQdHI8Q1NTVmFsdWU+IENTU1BhcnNlcjo6cGFyc2VJbWFnZVNldChDU1NQYXJzZXJWYWx1 ZUxpc3QqIHZhbHVlTGlzdCkKICAgICAgICAgICAgIHJldHVybiAwOwogCiAgICAgICAgIFJlZlB0 cjxDU1NJbWFnZVZhbHVlPiBpbWFnZSA9IENTU0ltYWdlVmFsdWU6OmNyZWF0ZShjb21wbGV0ZVVS TChhcmctPnN0cmluZykpOwotICAgICAgICBpbWFnZVNldC0+YXBwZW5kKGltYWdlKTsKKyAgICAg ICAgaW1hZ2VTZXQtPmFwcGVuZChpbWFnZS5yZWxlYXNlKCkpOwogICAgIAogICAgICAgICBhcmcg PSBmdW5jdGlvbkFyZ3MtPm5leHQoKTsKICAgICAgICAgaWYgKCFhcmcgfHwgYXJnLT51bml0ICE9 IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfRElNRU5TSU9OKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL0NTU1BhcnNlci5oIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5oCmlu ZGV4IDYxZWJlODRmNGQ1ZWM2NjlkZDliYTUwOWMxYWFkMzYyNzA0NzBmYzAuLmMxMzE1MDQ3MmYz NDVhZjc3ZTc1NzdhZDg1N2VmZGMyNGMwMjcyYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NQYXJzZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmgKQEAg LTI0MCw3ICsyNDAsNyBAQCBwdWJsaWM6CiAjZW5kaWYKIAogI2lmIEVOQUJMRShDU1NfSU1BR0Vf U0VUKQotICAgIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IHBhcnNlSW1hZ2VTZXQoQ1NTUGFyc2VyVmFs dWVMaXN0Kik7CisgICAgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gcGFyc2VJbWFnZVNldCgpOwogI2Vu ZGlmCiAKICNpZiBFTkFCTEUoQ1NTX0ZJTFRFUlMpCg== 204664 2013-06-13 19:31:18 -0700 2013-06-14 09:36:59 -0700 Patch bug-117617-20130614112936.patch text/plain 5355 ljaehun.lim U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNThhNmI1OTJiYmJiMzQz MDg1NjM5MjVlMWYzMzY0NDg2ZjVhYjU5ZS4uMjEzYTBlNGVjNWJhYjJmZTk2MWY1YzhmZjg1MGU1 MzkzYTIyZmJmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA2LTEzICBKYWVo dW4gTGltICA8bGphZWh1bi5saW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgQ1NTUGFyc2VyOjpw YXJzZUltYWdlU2V0KCkgZG9lc24ndCBuZWVkIGEgcGFyYW1ldGVyLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3NjE3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgcGFyc2VJbWFnZVNldCgpIGNhbiBnZXQgbV92 YWx1ZUxpc3QgZGlyZWN0bHkuCisgICAgICAgIEFuZCBtaW5vciBmaXhlcy4KKworICAgICAgICBO byBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGNzcy9DU1NQYXJz ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpwYXJzZVZhbHVlKToKKyAgICAg ICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cGFyc2VDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6 OkNTU1BhcnNlcjo6cGFyc2VGaWxsSW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2Vy OjpwYXJzZUJvcmRlckltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cGFyc2VJ bWFnZVNldCk6CisgICAgICAgICogY3NzL0NTU1BhcnNlci5oOgorCiAyMDEzLTA2LTEzICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBDbGlja2luZyBvbiBzbmFwc2hv dHRpbmcgcGx1Zy1pbnMgZG9lcyBub3QgcmVzdGFydCB0aGVtCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIu Y3BwCmluZGV4IDY2ZGQ1Y2YwM2Y1ZmQyZTdjNjhmZWIzMjA5OThhNWY2M2E5MmRmZDkuLmU1ZDRk YTQ5MDQ3NGM5YTljODIwNTZiOWYxMjYwYjAzYTU4OWM4MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJz ZXIuY3BwCkBAIC0yMDMyLDcgKzIwMzIsNyBAQCBib29sIENTU1BhcnNlcjo6cGFyc2VWYWx1ZShD U1NQcm9wZXJ0eUlEIHByb3BJZCwgYm9vbCBpbXBvcnRhbnQpCiAgICAgICAgICAgICAgICAgICAg IGltYWdlID0gQ1NTSW1hZ2VWYWx1ZTo6Y3JlYXRlKGNvbXBsZXRlVVJMKHVyaSkpOwogI2lmIEVO QUJMRShDU1NfSU1BR0VfU0VUKSAmJiBFTkFCTEUoTU9VU0VfQ1VSU09SX1NDQUxFKQogICAgICAg ICAgICAgfSBlbHNlIGlmICh2YWx1ZS0+dW5pdCA9PSBDU1NQYXJzZXJWYWx1ZTo6RnVuY3Rpb24g JiYgZXF1YWxJZ25vcmluZ0Nhc2UodmFsdWUtPmZ1bmN0aW9uLT5uYW1lLCAiLXdlYmtpdC1pbWFn ZS1zZXQoIikpIHsKLSAgICAgICAgICAgICAgICBpbWFnZSA9IHBhcnNlSW1hZ2VTZXQobV92YWx1 ZUxpc3QuZ2V0KCkpOworICAgICAgICAgICAgICAgIGltYWdlID0gcGFyc2VJbWFnZVNldCgpOwog ICAgICAgICAgICAgICAgIGlmICghaW1hZ2UpCiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwog I2VuZGlmCkBAIC0yMTY0LDcgKzIxNjQsNyBAQCBib29sIENTU1BhcnNlcjo6cGFyc2VWYWx1ZShD U1NQcm9wZXJ0eUlEIHByb3BJZCwgYm9vbCBpbXBvcnRhbnQpCiAgICAgICAgIH0KICNpZiBFTkFC TEUoQ1NTX0lNQUdFX1NFVCkKICAgICAgICAgZWxzZSBpZiAodmFsdWUtPnVuaXQgPT0gQ1NTUGFy c2VyVmFsdWU6OkZ1bmN0aW9uICYmIGVxdWFsSWdub3JpbmdDYXNlKHZhbHVlLT5mdW5jdGlvbi0+ bmFtZSwgIi13ZWJraXQtaW1hZ2Utc2V0KCIpKSB7Ci0gICAgICAgICAgICBwYXJzZWRWYWx1ZSA9 IHBhcnNlSW1hZ2VTZXQobV92YWx1ZUxpc3QuZ2V0KCkpOworICAgICAgICAgICAgcGFyc2VkVmFs dWUgPSBwYXJzZUltYWdlU2V0KCk7CiAgICAgICAgICAgICBpZiAoIXBhcnNlZFZhbHVlKQogICAg ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgICAgIG1fdmFsdWVMaXN0LT5uZXh0 KCk7CkBAIC0zNzM3LDcgKzM3MzcsNyBAQCBib29sIENTU1BhcnNlcjo6cGFyc2VDb250ZW50KENT U1Byb3BlcnR5SUQgcHJvcElkLCBib29sIGltcG9ydGFudCkKICAgICAgICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogI2lmIEVOQUJMRShDU1NfSU1BR0VfU0VUKQogICAgICAgICAgICAgfSBl bHNlIGlmIChlcXVhbElnbm9yaW5nQ2FzZSh2YWwtPmZ1bmN0aW9uLT5uYW1lLCAiLXdlYmtpdC1p bWFnZS1zZXQoIikpIHsKLSAgICAgICAgICAgICAgICBwYXJzZWRWYWx1ZSA9IHBhcnNlSW1hZ2VT ZXQobV92YWx1ZUxpc3QuZ2V0KCkpOworICAgICAgICAgICAgICAgIHBhcnNlZFZhbHVlID0gcGFy c2VJbWFnZVNldCgpOwogICAgICAgICAgICAgICAgIGlmICghcGFyc2VkVmFsdWUpCiAgICAgICAg ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgpAQCAtMzgzMCw3ICszODMwLDcgQEAg Ym9vbCBDU1NQYXJzZXI6OnBhcnNlRmlsbEltYWdlKENTU1BhcnNlclZhbHVlTGlzdCogdmFsdWVM aXN0LCBSZWZQdHI8Q1NTVmFsdWU+JgogICAgIAogI2lmIEVOQUJMRShDU1NfSU1BR0VfU0VUKQog ICAgIGlmICh2YWx1ZUxpc3QtPmN1cnJlbnQoKS0+dW5pdCA9PSBDU1NQYXJzZXJWYWx1ZTo6RnVu Y3Rpb24gJiYgZXF1YWxJZ25vcmluZ0Nhc2UodmFsdWVMaXN0LT5jdXJyZW50KCktPmZ1bmN0aW9u LT5uYW1lLCAiLXdlYmtpdC1pbWFnZS1zZXQoIikpIHsKLSAgICAgICAgdmFsdWUgPSBwYXJzZUlt YWdlU2V0KG1fdmFsdWVMaXN0LmdldCgpKTsKKyAgICAgICAgdmFsdWUgPSBwYXJzZUltYWdlU2V0 KCk7CiAgICAgICAgIGlmICh2YWx1ZSkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0K QEAgLTY3MzcsNyArNjczNyw3IEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZUJvcmRlckltYWdlKENT U1Byb3BlcnR5SUQgcHJvcElkLCBSZWZQdHI8Q1NTVmFsdWU+JiByZXN1bHQsCiAgICAgICAgICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKICNpZiBFTkFCTEUoQ1NTX0lNQUdFX1NFVCkKICAgICAg ICAgICAgIH0gZWxzZSBpZiAodmFsLT51bml0ID09IENTU1BhcnNlclZhbHVlOjpGdW5jdGlvbiAm JiBlcXVhbElnbm9yaW5nQ2FzZSh2YWwtPmZ1bmN0aW9uLT5uYW1lLCAiLXdlYmtpdC1pbWFnZS1z ZXQoIikpIHsKLSAgICAgICAgICAgICAgICBSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlID0gcGFyc2VJ bWFnZVNldChtX3ZhbHVlTGlzdC5nZXQoKSk7CisgICAgICAgICAgICAgICAgUmVmUHRyPENTU1Zh bHVlPiB2YWx1ZSA9IHBhcnNlSW1hZ2VTZXQoKTsKICAgICAgICAgICAgICAgICBpZiAodmFsdWUp CiAgICAgICAgICAgICAgICAgICAgIGNvbnRleHQuY29tbWl0SW1hZ2UodmFsdWUucmVsZWFzZSgp KTsKICAgICAgICAgICAgICAgICBlbHNlCkBAIC04MDIyLDI3ICs4MDIyLDIyIEBAIFBhc3NSZWZQ dHI8Q1NTVmFsdWU+IENTU1BhcnNlcjo6cGFyc2VJbWFnZVJlc29sdXRpb24oKQogI2VuZGlmCiAK ICNpZiBFTkFCTEUoQ1NTX0lNQUdFX1NFVCkKLVBhc3NSZWZQdHI8Q1NTVmFsdWU+IENTU1BhcnNl cjo6cGFyc2VJbWFnZVNldChDU1NQYXJzZXJWYWx1ZUxpc3QqIHZhbHVlTGlzdCkKK1Bhc3NSZWZQ dHI8Q1NTVmFsdWU+IENTU1BhcnNlcjo6cGFyc2VJbWFnZVNldCgpCiB7Ci0gICAgQ1NTUGFyc2Vy VmFsdWUqIGZ1bmN0aW9uID0gdmFsdWVMaXN0LT5jdXJyZW50KCk7Ci0KLSAgICBpZiAoZnVuY3Rp b24tPnVuaXQgIT0gQ1NTUGFyc2VyVmFsdWU6OkZ1bmN0aW9uKQotICAgICAgICByZXR1cm4gMDsK KyAgICBDU1NQYXJzZXJWYWx1ZSogdmFsdWUgPSBtX3ZhbHVlTGlzdC0+Y3VycmVudCgpOworICAg IEFTU0VSVCh2YWx1ZS0+dW5pdCA9PSBDU1NQYXJzZXJWYWx1ZTo6RnVuY3Rpb24pOwogCi0gICAg Q1NTUGFyc2VyVmFsdWVMaXN0KiBmdW5jdGlvbkFyZ3MgPSB2YWx1ZUxpc3QtPmN1cnJlbnQoKS0+ ZnVuY3Rpb24tPmFyZ3MuZ2V0KCk7CisgICAgQ1NTUGFyc2VyVmFsdWVMaXN0KiBmdW5jdGlvbkFy Z3MgPSB2YWx1ZS0+ZnVuY3Rpb24tPmFyZ3MuZ2V0KCk7CiAgICAgaWYgKCFmdW5jdGlvbkFyZ3Mg fHwgIWZ1bmN0aW9uQXJncy0+c2l6ZSgpIHx8ICFmdW5jdGlvbkFyZ3MtPmN1cnJlbnQoKSkKICAg ICAgICAgcmV0dXJuIDA7CiAKICAgICBSZWZQdHI8Q1NTSW1hZ2VTZXRWYWx1ZT4gaW1hZ2VTZXQg PSBDU1NJbWFnZVNldFZhbHVlOjpjcmVhdGUoKTsKLQogICAgIENTU1BhcnNlclZhbHVlKiBhcmcg PSBmdW5jdGlvbkFyZ3MtPmN1cnJlbnQoKTsKICAgICB3aGlsZSAoYXJnKSB7CiAgICAgICAgIGlm IChhcmctPnVuaXQgIT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19VUkkpCiAgICAgICAgICAgICBy ZXR1cm4gMDsKIAotICAgICAgICBSZWZQdHI8Q1NTSW1hZ2VWYWx1ZT4gaW1hZ2UgPSBDU1NJbWFn ZVZhbHVlOjpjcmVhdGUoY29tcGxldGVVUkwoYXJnLT5zdHJpbmcpKTsKLSAgICAgICAgaW1hZ2VT ZXQtPmFwcGVuZChpbWFnZSk7Ci0gICAgCisgICAgICAgIGltYWdlU2V0LT5hcHBlbmQoQ1NTSW1h Z2VWYWx1ZTo6Y3JlYXRlKGNvbXBsZXRlVVJMKGFyZy0+c3RyaW5nKSkpOwogICAgICAgICBhcmcg PSBmdW5jdGlvbkFyZ3MtPm5leHQoKTsKICAgICAgICAgaWYgKCFhcmcgfHwgYXJnLT51bml0ICE9 IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfRElNRU5TSU9OKQogICAgICAgICAgICAgcmV0dXJuIDA7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmggYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTUGFyc2VyLmgKaW5kZXggNjFlYmU4NGY0ZDVlYzY2OWRkOWJhNTA5YzFhYWQz NjI3MDQ3MGZjMC4uYzEzMTUwNDcyZjM0NWFmNzdlNzU3N2FkODU3ZWZkYzI0YzAyNzJhNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NQYXJzZXIuaApAQCAtMjQwLDcgKzI0MCw3IEBAIHB1YmxpYzoKICNlbmRpZgog CiAjaWYgRU5BQkxFKENTU19JTUFHRV9TRVQpCi0gICAgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gcGFy c2VJbWFnZVNldChDU1NQYXJzZXJWYWx1ZUxpc3QqKTsKKyAgICBQYXNzUmVmUHRyPENTU1ZhbHVl PiBwYXJzZUltYWdlU2V0KCk7CiAjZW5kaWYKIAogI2lmIEVOQUJMRShDU1NfRklMVEVSUykK