140139 2015-01-06 11:53:54 -0800 Investigate the character type of repeated string instead of checking is8Bit flag 2015-01-08 08:33:20 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ysuzuki ysuzuki commit-queue darin oldest_to_newest 1059097 0 ysuzuki 2015-01-06 11:53:54 -0800 Investigate the character type of repeated string instead of checking is8Bit flag 1059098 1 244082 ysuzuki 2015-01-06 11:57:59 -0800 Created attachment 244082 Patch 1059101 2 244082 ysuzuki 2015-01-06 12:02:39 -0800 Comment on attachment 244082 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=244082&action=review In this patch, I've fixed the issue pointed at [1]. 1: https://bugs.webkit.org/show_bug.cgi?id=140047#c22 > Source/JavaScriptCore/runtime/StringPrototype.cpp:679 > +static inline JSValue repeatCharacter(ExecState* exec, CharacterType character, unsigned repeatCount) Change name to `repeatCharacter`. > Source/JavaScriptCore/runtime/StringPrototype.cpp:725 > + if (!(character & ~0xff)) Checking character is 8bit or not. This check is the same to the guart which is used in the StringImpl / StringBuiler[1]. 1: http://trac.webkit.org/browser/trunk/Source/WTF/wtf/text/StringImpl.h#L1135 1059108 3 244087 ysuzuki 2015-01-06 12:07:51 -0800 Created attachment 244087 Patch 1059154 4 244087 darin 2015-01-06 14:12:01 -0800 Comment on attachment 244087 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=244087&action=review > Source/JavaScriptCore/runtime/StringPrototype.cpp:727 > + return JSValue::encode(repeatCharacter<LChar>(exec, static_cast<LChar>(character), repeatCount)); > + return JSValue::encode(repeatCharacter<UChar>(exec, character, repeatCount)); I don’t think the <LChar> and <UChar> are needed after repeatCharacter; I think template type deduction will take care of this. 1059386 5 244087 ysuzuki 2015-01-07 06:33:06 -0800 Comment on attachment 244087 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=244087&action=review Thanks for your review :) >> Source/JavaScriptCore/runtime/StringPrototype.cpp:727 >> + return JSValue::encode(repeatCharacter<UChar>(exec, character, repeatCount)); > > I don’t think the <LChar> and <UChar> are needed after repeatCharacter; I think template type deduction will take care of this. Agreed. `static_cast` ensures the instantiated result of the template function. I'll fix it and update the patch. 1059387 6 244154 ysuzuki 2015-01-07 06:34:24 -0800 Created attachment 244154 Patch 1059718 7 244154 commit-queue 2015-01-07 21:09:27 -0800 Comment on attachment 244154 Patch Clearing flags on attachment: 244154 Committed r178098: <http://trac.webkit.org/changeset/178098> 1059719 8 commit-queue 2015-01-07 21:09:30 -0800 All reviewed patches have been landed. Closing bug. 1059822 9 ysuzuki 2015-01-08 08:33:20 -0800 Thank you for your r+ and cq+ :D 244082 2015-01-06 11:57:59 -0800 2015-01-06 12:07:48 -0800 Patch bug-140139-20150107045803.patch text/plain 3097 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3OTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl N2E5Y2U5YTY0N2VhOTEyNmEzMjFmYWNiNzBjNTZiOGM3MGVlN2Y1Li43ODZjMjNhNTM3ZTQ2OTk2 MTg0Yjk1MDVmZTQ4OGUxZDhjOTYxMzM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyMCBAQAogMjAxNS0wMS0wNiAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KIAorICAgICAgICBJbnZlc3RpZ2F0ZSB0aGUgY2hhcmFjdGVyIHR5cGUgb2YgcmVwZWF0 ZWQgc3RyaW5nIGluc3RlYWQgb2YgY2hlY2tpbmcgaXM4Qml0IGZsYWcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDEzOQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2YgY2hlY2tpbmcgaXM4 Qml0IGZsYWcgb2YgdGhlIHJlcGVhdGVkIHN0cmluZywgaW52ZXN0aWdhdGUKKyAgICAgICAgdGhl IGFjdHVhbCB2YWx1ZSBvZiB0aGUgcmVwZWF0ZWQgY2hhcmFjdGVyIFNpbmNlIGk4Qml0IGZsYWcg Z2l2ZSBhIGZhbHNlIG5lZ2F0aXZlIGNhc2UuCisKKyAgICAgICAgKiBydW50aW1lL1N0cmluZ1By b3RvdHlwZS5jcHA6CisgICAgICAgIChKU0M6OnJlcGVhdENoYXJhY3Rlcik6CisgICAgICAgIChK U0M6OnN0cmluZ1Byb3RvRnVuY1JlcGVhdCk6CisgICAgICAgIChKU0M6OnJlcGVhdFNtYWxsU3Ry aW5nKTogRGVsZXRlZC4KKworMjAxNS0wMS0wNiAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVh QGdtYWlsLmNvbT4KKwogICAgICAgICBJbXBsZW1lbnQgRVM2IFN0cmluZy5wcm90b3R5cGUucmVw ZWF0KGNvdW50KQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQwMDQ3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0 cmluZ1Byb3RvdHlwZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJpbmdQ cm90b3R5cGUuY3BwCmluZGV4IDE2NTI4NGJlODk4ZGYxZDM1MDdhNGI3NzZiY2FiNTZjZTBiODIw MmQuLmYzODY2YTA5MWQyMmMzNTA4Y2QzYTRmZGQzNjQ2Y2MzYjUxOTQyZWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cmluZ1Byb3RvdHlwZS5jcHAKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RyaW5nUHJvdG90eXBlLmNwcApAQCAtNjc2 LDE3ICs2NzYsMTQgQEAgc3RhdGljIGlubGluZSBib29sIGNoZWNrT2JqZWN0Q29lcmNpYmxlKEpT VmFsdWUgdGhpc1ZhbHVlKQogfQogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4K LXN0YXRpYyBpbmxpbmUgSlNWYWx1ZSByZXBlYXRTbWFsbFN0cmluZyhFeGVjU3RhdGUqIGV4ZWMs IGNvbnN0IFN0cmluZyYgc3RyaW5nLCB1bnNpZ25lZCByZXBlYXRDb3VudCkKK3N0YXRpYyBpbmxp bmUgSlNWYWx1ZSByZXBlYXRDaGFyYWN0ZXIoRXhlY1N0YXRlKiBleGVjLCBDaGFyYWN0ZXJUeXBl IGNoYXJhY3RlciwgdW5zaWduZWQgcmVwZWF0Q291bnQpCiB7Ci0gICAgQVNTRVJUKHN0cmluZy5s ZW5ndGgoKSA9PSAxKTsKLSAgICB1bnNpZ25lZCB0b3RhbExlbmd0aCA9IHJlcGVhdENvdW50Owog ICAgIENoYXJhY3RlclR5cGUqIGJ1ZmZlciA9IG51bGxwdHI7Ci0gICAgQ2hhcmFjdGVyVHlwZSBj aGFyYWN0ZXIgPSBzdHJpbmcuY2hhcmFjdGVyczxDaGFyYWN0ZXJUeXBlPigpWzBdOwotICAgIFJl ZlB0cjxTdHJpbmdJbXBsPiBpbXBsID0gU3RyaW5nSW1wbDo6dHJ5Q3JlYXRlVW5pbml0aWFsaXpl ZCh0b3RhbExlbmd0aCwgYnVmZmVyKTsKKyAgICBSZWZQdHI8U3RyaW5nSW1wbD4gaW1wbCA9IFN0 cmluZ0ltcGw6OnRyeUNyZWF0ZVVuaW5pdGlhbGl6ZWQocmVwZWF0Q291bnQsIGJ1ZmZlcik7CiAg ICAgaWYgKCFpbXBsKQogICAgICAgICByZXR1cm4gdGhyb3dPdXRPZk1lbW9yeUVycm9yKGV4ZWMp OwogCi0gICAgc3RkOjpmaWxsX24oYnVmZmVyLCB0b3RhbExlbmd0aCwgY2hhcmFjdGVyKTsKKyAg ICBzdGQ6OmZpbGxfbihidWZmZXIsIHJlcGVhdENvdW50LCBjaGFyYWN0ZXIpOwogCiAgICAgcmV0 dXJuIGpzU3RyaW5nKGV4ZWMsIGltcGwucmVsZWFzZSgpKTsKIH0KQEAgLTcyNCw5ICs3MjEsMTAg QEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBzdHJpbmdQcm90b0Z1bmNSZXBlYXQoRXhl Y1N0YXRlKiBleGVjKQogICAgIC8vIGFsbG9jYXRpbmcgYSBzZXF1ZW50aWFsIGJ1ZmZlciBhbmQg ZmlsbCB3aXRoIHRoZSByZXBlYXRlZCBzdHJpbmcgZm9yIGVmZmljaWVuY3kuCiAgICAgaWYgKHN0 cmluZy0+bGVuZ3RoKCkgPT0gMSkgewogICAgICAgICBTdHJpbmcgcmVwZWF0ZWRTdHJpbmcgPSBz dHJpbmctPnZhbHVlKGV4ZWMpOwotICAgICAgICBpZiAocmVwZWF0ZWRTdHJpbmcuaXM4Qml0KCkp Ci0gICAgICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHJlcGVhdFNtYWxsU3RyaW5nPExD aGFyPihleGVjLCByZXBlYXRlZFN0cmluZywgcmVwZWF0Q291bnQpKTsKLSAgICAgICAgcmV0dXJu IEpTVmFsdWU6OmVuY29kZShyZXBlYXRTbWFsbFN0cmluZzxVQ2hhcj4oZXhlYywgcmVwZWF0ZWRT dHJpbmcsIHJlcGVhdENvdW50KSk7CisgICAgICAgIFVDaGFyIGNoYXJhY3RlciA9IHJlcGVhdGVk U3RyaW5nLmF0KDApOworICAgICAgICBpZiAoIShjaGFyYWN0ZXIgJiB+MHhmZikpCisgICAgICAg ICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHJlcGVhdENoYXJhY3RlcjxMQ2hhcj4oZXhlYywg c3RhdGljX2Nhc3Q8TENoYXI+KGNoYXJhY3RlciksIHJlcGVhdENvdW50KSk7CisgICAgICAgIHJl dHVybiBKU1ZhbHVlOjplbmNvZGUocmVwZWF0Q2hhcmFjdGVyPFVDaGFyPihleGVjLCBjaGFyYWN0 ZXIsIHJlcGVhdENvdW50KSk7CiAgICAgfQogCiAgICAgSlNSb3BlU3RyaW5nOjpSb3BlQnVpbGRl ciByb3BlQnVpbGRlcih2bSk7Cg== 244087 2015-01-06 12:07:51 -0800 2015-01-07 06:34:20 -0800 Patch bug-140139-20150107050755.patch text/plain 3097 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3OTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl N2E5Y2U5YTY0N2VhOTEyNmEzMjFmYWNiNzBjNTZiOGM3MGVlN2Y1Li42Njg5MWNiOWY4NjEwOGNk YmI2Yjc0YzUwMjY4NjBkMWI2MDVhNjI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyMCBAQAogMjAxNS0wMS0wNiAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KIAorICAgICAgICBJbnZlc3RpZ2F0ZSB0aGUgY2hhcmFjdGVyIHR5cGUgb2YgcmVwZWF0 ZWQgc3RyaW5nIGluc3RlYWQgb2YgY2hlY2tpbmcgaXM4Qml0IGZsYWcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDEzOQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2YgY2hlY2tpbmcgaXM4 Qml0IGZsYWcgb2YgdGhlIHJlcGVhdGVkIHN0cmluZywgaW52ZXN0aWdhdGUKKyAgICAgICAgdGhl IGFjdHVhbCB2YWx1ZSBvZiB0aGUgcmVwZWF0ZWQgY2hhcmFjdGVyIHNpbmNlIGk4Qml0IGZsYWcg Z2l2ZSBhIGZhbHNlIG5lZ2F0aXZlIGNhc2UuCisKKyAgICAgICAgKiBydW50aW1lL1N0cmluZ1By b3RvdHlwZS5jcHA6CisgICAgICAgIChKU0M6OnJlcGVhdENoYXJhY3Rlcik6CisgICAgICAgIChK U0M6OnN0cmluZ1Byb3RvRnVuY1JlcGVhdCk6CisgICAgICAgIChKU0M6OnJlcGVhdFNtYWxsU3Ry aW5nKTogRGVsZXRlZC4KKworMjAxNS0wMS0wNiAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVh QGdtYWlsLmNvbT4KKwogICAgICAgICBJbXBsZW1lbnQgRVM2IFN0cmluZy5wcm90b3R5cGUucmVw ZWF0KGNvdW50KQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQwMDQ3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0 cmluZ1Byb3RvdHlwZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJpbmdQ cm90b3R5cGUuY3BwCmluZGV4IDE2NTI4NGJlODk4ZGYxZDM1MDdhNGI3NzZiY2FiNTZjZTBiODIw MmQuLmYzODY2YTA5MWQyMmMzNTA4Y2QzYTRmZGQzNjQ2Y2MzYjUxOTQyZWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cmluZ1Byb3RvdHlwZS5jcHAKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RyaW5nUHJvdG90eXBlLmNwcApAQCAtNjc2 LDE3ICs2NzYsMTQgQEAgc3RhdGljIGlubGluZSBib29sIGNoZWNrT2JqZWN0Q29lcmNpYmxlKEpT VmFsdWUgdGhpc1ZhbHVlKQogfQogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4K LXN0YXRpYyBpbmxpbmUgSlNWYWx1ZSByZXBlYXRTbWFsbFN0cmluZyhFeGVjU3RhdGUqIGV4ZWMs IGNvbnN0IFN0cmluZyYgc3RyaW5nLCB1bnNpZ25lZCByZXBlYXRDb3VudCkKK3N0YXRpYyBpbmxp bmUgSlNWYWx1ZSByZXBlYXRDaGFyYWN0ZXIoRXhlY1N0YXRlKiBleGVjLCBDaGFyYWN0ZXJUeXBl IGNoYXJhY3RlciwgdW5zaWduZWQgcmVwZWF0Q291bnQpCiB7Ci0gICAgQVNTRVJUKHN0cmluZy5s ZW5ndGgoKSA9PSAxKTsKLSAgICB1bnNpZ25lZCB0b3RhbExlbmd0aCA9IHJlcGVhdENvdW50Owog ICAgIENoYXJhY3RlclR5cGUqIGJ1ZmZlciA9IG51bGxwdHI7Ci0gICAgQ2hhcmFjdGVyVHlwZSBj aGFyYWN0ZXIgPSBzdHJpbmcuY2hhcmFjdGVyczxDaGFyYWN0ZXJUeXBlPigpWzBdOwotICAgIFJl ZlB0cjxTdHJpbmdJbXBsPiBpbXBsID0gU3RyaW5nSW1wbDo6dHJ5Q3JlYXRlVW5pbml0aWFsaXpl ZCh0b3RhbExlbmd0aCwgYnVmZmVyKTsKKyAgICBSZWZQdHI8U3RyaW5nSW1wbD4gaW1wbCA9IFN0 cmluZ0ltcGw6OnRyeUNyZWF0ZVVuaW5pdGlhbGl6ZWQocmVwZWF0Q291bnQsIGJ1ZmZlcik7CiAg ICAgaWYgKCFpbXBsKQogICAgICAgICByZXR1cm4gdGhyb3dPdXRPZk1lbW9yeUVycm9yKGV4ZWMp OwogCi0gICAgc3RkOjpmaWxsX24oYnVmZmVyLCB0b3RhbExlbmd0aCwgY2hhcmFjdGVyKTsKKyAg ICBzdGQ6OmZpbGxfbihidWZmZXIsIHJlcGVhdENvdW50LCBjaGFyYWN0ZXIpOwogCiAgICAgcmV0 dXJuIGpzU3RyaW5nKGV4ZWMsIGltcGwucmVsZWFzZSgpKTsKIH0KQEAgLTcyNCw5ICs3MjEsMTAg QEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBzdHJpbmdQcm90b0Z1bmNSZXBlYXQoRXhl Y1N0YXRlKiBleGVjKQogICAgIC8vIGFsbG9jYXRpbmcgYSBzZXF1ZW50aWFsIGJ1ZmZlciBhbmQg ZmlsbCB3aXRoIHRoZSByZXBlYXRlZCBzdHJpbmcgZm9yIGVmZmljaWVuY3kuCiAgICAgaWYgKHN0 cmluZy0+bGVuZ3RoKCkgPT0gMSkgewogICAgICAgICBTdHJpbmcgcmVwZWF0ZWRTdHJpbmcgPSBz dHJpbmctPnZhbHVlKGV4ZWMpOwotICAgICAgICBpZiAocmVwZWF0ZWRTdHJpbmcuaXM4Qml0KCkp Ci0gICAgICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHJlcGVhdFNtYWxsU3RyaW5nPExD aGFyPihleGVjLCByZXBlYXRlZFN0cmluZywgcmVwZWF0Q291bnQpKTsKLSAgICAgICAgcmV0dXJu IEpTVmFsdWU6OmVuY29kZShyZXBlYXRTbWFsbFN0cmluZzxVQ2hhcj4oZXhlYywgcmVwZWF0ZWRT dHJpbmcsIHJlcGVhdENvdW50KSk7CisgICAgICAgIFVDaGFyIGNoYXJhY3RlciA9IHJlcGVhdGVk U3RyaW5nLmF0KDApOworICAgICAgICBpZiAoIShjaGFyYWN0ZXIgJiB+MHhmZikpCisgICAgICAg ICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHJlcGVhdENoYXJhY3RlcjxMQ2hhcj4oZXhlYywg c3RhdGljX2Nhc3Q8TENoYXI+KGNoYXJhY3RlciksIHJlcGVhdENvdW50KSk7CisgICAgICAgIHJl dHVybiBKU1ZhbHVlOjplbmNvZGUocmVwZWF0Q2hhcmFjdGVyPFVDaGFyPihleGVjLCBjaGFyYWN0 ZXIsIHJlcGVhdENvdW50KSk7CiAgICAgfQogCiAgICAgSlNSb3BlU3RyaW5nOjpSb3BlQnVpbGRl ciByb3BlQnVpbGRlcih2bSk7Cg== 244154 2015-01-07 06:34:24 -0800 2015-01-07 21:09:27 -0800 Patch bug-140139-20150107233428.patch text/plain 3025 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3OTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl N2E5Y2U5YTY0N2VhOTEyNmEzMjFmYWNiNzBjNTZiOGM3MGVlN2Y1Li4xOThhYWI5MTcwZTM4MzRi NGQwMjE2OGZjY2QyYzJkYWVhMzliZWUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxNS0wMS0wNyAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBJbnZlc3RpZ2F0ZSB0aGUgY2hhcmFjdGVyIHR5cGUgb2YgcmVwZWF0 ZWQgc3RyaW5nIGluc3RlYWQgb2YgY2hlY2tpbmcgaXM4Qml0IGZsYWcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDEzOQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2YgY2hlY2tpbmcgaXM4 Qml0IGZsYWcgb2YgdGhlIHJlcGVhdGVkIHN0cmluZywgaW52ZXN0aWdhdGUKKyAgICAgICAgdGhl IGFjdHVhbCB2YWx1ZSBvZiB0aGUgcmVwZWF0ZWQgY2hhcmFjdGVyIHNpbmNlIGk4Qml0IGZsYWcg Z2l2ZSBhIGZhbHNlIG5lZ2F0aXZlIGNhc2UuCisKKyAgICAgICAgKiBydW50aW1lL1N0cmluZ1By b3RvdHlwZS5jcHA6CisgICAgICAgIChKU0M6OnJlcGVhdENoYXJhY3Rlcik6CisgICAgICAgIChK U0M6OnN0cmluZ1Byb3RvRnVuY1JlcGVhdCk6CisgICAgICAgIChKU0M6OnJlcGVhdFNtYWxsU3Ry aW5nKTogRGVsZXRlZC4KKwogMjAxNS0wMS0wNiAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVh QGdtYWlsLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgRVM2IFN0cmluZy5wcm90b3R5cGUucmVw ZWF0KGNvdW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3Ry aW5nUHJvdG90eXBlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cmluZ1By b3RvdHlwZS5jcHAKaW5kZXggMTY1Mjg0YmU4OThkZjFkMzUwN2E0Yjc3NmJjYWI1NmNlMGI4MjAy ZC4uZmUwNjhlNjE1MzM0OTJlYTg2MDdkZmMxZmZjMWExZTA1NzE2NmJiYiAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RyaW5nUHJvdG90eXBlLmNwcAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJpbmdQcm90b3R5cGUuY3BwCkBAIC02NzYs MTcgKzY3NiwxNCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgY2hlY2tPYmplY3RDb2VyY2libGUoSlNW YWx1ZSB0aGlzVmFsdWUpCiB9CiAKIHRlbXBsYXRlIDx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPgot c3RhdGljIGlubGluZSBKU1ZhbHVlIHJlcGVhdFNtYWxsU3RyaW5nKEV4ZWNTdGF0ZSogZXhlYywg Y29uc3QgU3RyaW5nJiBzdHJpbmcsIHVuc2lnbmVkIHJlcGVhdENvdW50KQorc3RhdGljIGlubGlu ZSBKU1ZhbHVlIHJlcGVhdENoYXJhY3RlcihFeGVjU3RhdGUqIGV4ZWMsIENoYXJhY3RlclR5cGUg Y2hhcmFjdGVyLCB1bnNpZ25lZCByZXBlYXRDb3VudCkKIHsKLSAgICBBU1NFUlQoc3RyaW5nLmxl bmd0aCgpID09IDEpOwotICAgIHVuc2lnbmVkIHRvdGFsTGVuZ3RoID0gcmVwZWF0Q291bnQ7CiAg ICAgQ2hhcmFjdGVyVHlwZSogYnVmZmVyID0gbnVsbHB0cjsKLSAgICBDaGFyYWN0ZXJUeXBlIGNo YXJhY3RlciA9IHN0cmluZy5jaGFyYWN0ZXJzPENoYXJhY3RlclR5cGU+KClbMF07Ci0gICAgUmVm UHRyPFN0cmluZ0ltcGw+IGltcGwgPSBTdHJpbmdJbXBsOjp0cnlDcmVhdGVVbmluaXRpYWxpemVk KHRvdGFsTGVuZ3RoLCBidWZmZXIpOworICAgIFJlZlB0cjxTdHJpbmdJbXBsPiBpbXBsID0gU3Ry aW5nSW1wbDo6dHJ5Q3JlYXRlVW5pbml0aWFsaXplZChyZXBlYXRDb3VudCwgYnVmZmVyKTsKICAg ICBpZiAoIWltcGwpCiAgICAgICAgIHJldHVybiB0aHJvd091dE9mTWVtb3J5RXJyb3IoZXhlYyk7 CiAKLSAgICBzdGQ6OmZpbGxfbihidWZmZXIsIHRvdGFsTGVuZ3RoLCBjaGFyYWN0ZXIpOworICAg IHN0ZDo6ZmlsbF9uKGJ1ZmZlciwgcmVwZWF0Q291bnQsIGNoYXJhY3Rlcik7CiAKICAgICByZXR1 cm4ganNTdHJpbmcoZXhlYywgaW1wbC5yZWxlYXNlKCkpOwogfQpAQCAtNzI0LDkgKzcyMSwxMCBA QCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIHN0cmluZ1Byb3RvRnVuY1JlcGVhdChFeGVj U3RhdGUqIGV4ZWMpCiAgICAgLy8gYWxsb2NhdGluZyBhIHNlcXVlbnRpYWwgYnVmZmVyIGFuZCBm aWxsIHdpdGggdGhlIHJlcGVhdGVkIHN0cmluZyBmb3IgZWZmaWNpZW5jeS4KICAgICBpZiAoc3Ry aW5nLT5sZW5ndGgoKSA9PSAxKSB7CiAgICAgICAgIFN0cmluZyByZXBlYXRlZFN0cmluZyA9IHN0 cmluZy0+dmFsdWUoZXhlYyk7Ci0gICAgICAgIGlmIChyZXBlYXRlZFN0cmluZy5pczhCaXQoKSkK LSAgICAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUocmVwZWF0U21hbGxTdHJpbmc8TENo YXI+KGV4ZWMsIHJlcGVhdGVkU3RyaW5nLCByZXBlYXRDb3VudCkpOwotICAgICAgICByZXR1cm4g SlNWYWx1ZTo6ZW5jb2RlKHJlcGVhdFNtYWxsU3RyaW5nPFVDaGFyPihleGVjLCByZXBlYXRlZFN0 cmluZywgcmVwZWF0Q291bnQpKTsKKyAgICAgICAgVUNoYXIgY2hhcmFjdGVyID0gcmVwZWF0ZWRT dHJpbmcuYXQoMCk7CisgICAgICAgIGlmICghKGNoYXJhY3RlciAmIH4weGZmKSkKKyAgICAgICAg ICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUocmVwZWF0Q2hhcmFjdGVyKGV4ZWMsIHN0YXRpY19j YXN0PExDaGFyPihjaGFyYWN0ZXIpLCByZXBlYXRDb3VudCkpOworICAgICAgICByZXR1cm4gSlNW YWx1ZTo6ZW5jb2RlKHJlcGVhdENoYXJhY3RlcihleGVjLCBjaGFyYWN0ZXIsIHJlcGVhdENvdW50 KSk7CiAgICAgfQogCiAgICAgSlNSb3BlU3RyaW5nOjpSb3BlQnVpbGRlciByb3BlQnVpbGRlcih2 bSk7Cg==