130438 2014-03-18 18:45:59 -0700 Small cleanup of empty string 2014-03-19 12:02:56 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough benjamin cmarcelo commit-queue kling oldest_to_newest 991977 0 barraclough 2014-03-18 18:45:59 -0700 Some prep for https://bugs.webkit.org/show_bug.cgi?id=128624. 991985 1 227144 barraclough 2014-03-18 19:05:32 -0700 Created attachment 227144 Fix 991986 2 kling 2014-03-18 19:08:22 -0700 The PCRE workaround removal has been attempted before, see bug 123265. 991988 3 barraclough 2014-03-18 19:21:15 -0700 (In reply to comment #2) > The PCRE workaround removal has been attempted before, see bug 123265. Hmmm, interesting. :-( The tests mentioned in the bug pass for me, maybe I should try again. :-/ 991989 4 227144 andersca 2014-03-18 19:22:15 -0700 Comment on attachment 227144 Fix View in context: https://bugs.webkit.org/attachment.cgi?id=227144&action=review > Source/WTF/wtf/text/StringImpl.h:164 > + , m_data8(reinterpret_cast<LChar*>(1)) Even though this is what the comment said, I think it's awkward. I think you should do what we do for the StringImpl(CreateEmptyUniqueTag) constructor instead: // We expect m_length to be initialized to 0 as we use it // to represent a null terminated buffer. , m_data8(reinterpret_cast<const LChar*>(&m_length)) > Source/WTF/wtf/text/StringStatics.cpp:46 > + DEPRECATED_DEFINE_STATIC_LOCAL(StringImpl, emptyString, (ConstructEmptyString)); Please change this to static NeverDestroyed<StringImpl> emptyString(ConstructEmptyString); instead. 991999 5 227148 barraclough 2014-03-18 19:41:44 -0700 Created attachment 227148 Patch with review comments for EWS 992198 6 barraclough 2014-03-19 12:02:56 -0700 Fixed in r165906 227144 2014-03-18 19:05:32 -0700 2014-03-18 19:41:44 -0700 Fix 130438.1.patch text/plain 5496 barraclough SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNjU4NjEpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE0LTAzLTE4ICBHYXZpbiBCYXJyYWNsb3VnaCAg PGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBTbWFsbCBjbGVhbnVwIG9mIGVtcHR5 IHN0cmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTMwNDM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhlIGVtcHR5IHN0cmluZyBpcyB3ZWlyZCBiZWN1YXNlIGl0IGlzIHVzZWQgYXMgdGhlIGltcGwg Zm9yIGFuIEF0b21pY1N0cmluZywgYnV0IGlzQXRvbWljKCkKKyAgICAgICAgcmV0dXJucyBmYWxz ZS4KKyAgICAgICAgQWxzbywgd2Ugc2V0IGEgdmFsaWQgcG9pbnRlciBmb3IgdGhlIGNoYXJhY3Rl cnMgcG9pbnRlciBkdWUgdG8gYW4gb2xkIFBDUkUgYnVnOyByZW1vdmUgdGhpcy4KKyAgICAgICAg QWxzbywgd2UgY3VycmVudGx5IG9ubHkgY3JlYXRlIG9uZSAnc3RhdGljJyBzdHJpbmcsIHRoZSBl bXB0eSBzdHJpbmcuIEFkZGluZyBtb3JlIG1pZ2h0IGJyZWFrCisgICAgICAgICBhc3N1bXRpb25z LGluaGliaXQgdGhlIGNvbnN0cnVjdG9yIGZyb20gYmVpbmcgdXNlZCB0byBjcmVhdGUgb3RoZXIg c3RhdGljIHN0cmluZ3MgZm9yIG5vdy4KKworICAgICAgICAqIHd0Zi90ZXh0L0F0b21pY1N0cmlu Zy5oOgorICAgICAgICAoV1RGOjpBdG9taWNTdHJpbmc6OmFkZCk6CisgICAgICAgICAgICAtIHVw ZGF0ZSBhc3NlcnQuCisgICAgICAgICogd3RmL3RleHQvU3RyaW5nSW1wbC5oOgorICAgICAgICAo V1RGOjpTdHJpbmdJbXBsOjpTdHJpbmdJbXBsKToKKyAgICAgICAgICAgIC0gTWVyZ2UgQ29uc3Ry dWN0U3RhdGljU3RyaW5nIGNvbnN0cnVjdG9ycywgb25seSBhbGxvdyB0aGUgZW1wdHkgc3RhdGlj IHN0cmluZyB0byBiZSBjb25zdHJ1Y3RlZC4KKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdTdGF0 aWNzLmNwcDoKKyAgICAgICAgKFdURjo6U3RyaW5nSW1wbDo6ZW1wdHkpOgorICAgICAgICAgICAg LSBDb25zdHJ1Y3RTdGF0aWNTdHJpbmcgLT4gQ29uc3RydWN0RW1wdHlTdHJpbmcsIHJlbW92ZSBj aGFyYWN0ZXJzLCBsZW5ndGggYXJndW1lbnRzLgorCiAyMDE0LTAzLTE4ICBEYXJpbiBBZGxlciAg PGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWR1Y2UgdXNlIG9mIGRlcHJlY2F0ZWRDaGFy YWN0ZXJzIGluIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XVEYvd3RmL3RleHQvQXRvbWljU3RyaW5n LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvdGV4dC9BdG9taWNTdHJpbmcuaAkocmV2 aXNpb24gMTY1NzM5KQorKysgU291cmNlL1dURi93dGYvdGV4dC9BdG9taWNTdHJpbmcuaAkod29y a2luZyBjb3B5KQpAQCAtMTg1LDcgKzE4NSw3IEBAIHByaXZhdGU6CiAgICAgQUxXQVlTX0lOTElO RSBzdGF0aWMgUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBhZGQoU3RyaW5nSW1wbCogc3RyaW5nKQog ICAgIHsKICAgICAgICAgaWYgKCFzdHJpbmcgfHwgc3RyaW5nLT5pc0F0b21pYygpKSB7Ci0gICAg ICAgICAgICBBU1NFUlRfV0lUSF9NRVNTQUdFKCFzdHJpbmcgfHwgaXNJbkF0b21pY1N0cmluZ1Rh YmxlKHN0cmluZyksICJUaGUgYXRvbWljIHN0cmluZyBjb21lcyBmcm9tIGFuIG90aGVyIHRocmVh ZCEiKTsKKyAgICAgICAgICAgIEFTU0VSVF9XSVRIX01FU1NBR0UoIXN0cmluZyB8fCBzdHJpbmcg PT0gU3RyaW5nSW1wbDo6ZW1wdHkoKSB8fCBpc0luQXRvbWljU3RyaW5nVGFibGUoc3RyaW5nKSwg IlRoZSBhdG9taWMgc3RyaW5nIGNvbWVzIGZyb20gYW4gb3RoZXIgdGhyZWFkISIpOwogICAgICAg ICAgICAgcmV0dXJuIHN0cmluZzsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gYWRkU2xvd0Nh c2Uoc3RyaW5nKTsKSW5kZXg6IFNvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5oCShyZXZpc2lvbiAxNjU3 MzkpCisrKyBTb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuaAkod29ya2luZyBjb3B5KQpA QCAtMTU3LDI5ICsxNTcsMTIgQEAgcHJpdmF0ZToKICAgICAvLyBVc2VkIHRvIGNvbnN0cnVjdCBz dGF0aWMgc3RyaW5ncywgd2hpY2ggaGF2ZSBhbiBzcGVjaWFsIHJlZkNvdW50IHRoYXQgY2FuIG5l dmVyIGhpdCB6ZXJvLgogICAgIC8vIFRoaXMgbWVhbnMgdGhhdCB0aGUgc3RhdGljIHN0cmluZyB3 aWxsIG5ldmVyIGJlIGRlc3Ryb3llZCwgd2hpY2ggaXMgaW1wb3J0YW50IGJlY2F1c2UKICAgICAv LyBzdGF0aWMgc3RyaW5ncyB3aWxsIGJlIHNoYXJlZCBhY3Jvc3MgdGhyZWFkcyAmIHJlZi1jb3Vu dGVkIGluIGEgbm9uLXRocmVhZHNhZmUgbWFubmVyLgotICAgIGVudW0gQ29uc3RydWN0U3RhdGlj U3RyaW5nVGFnIHsgQ29uc3RydWN0U3RhdGljU3RyaW5nIH07Ci0gICAgU3RyaW5nSW1wbChjb25z dCBVQ2hhciogY2hhcmFjdGVycywgdW5zaWduZWQgbGVuZ3RoLCBDb25zdHJ1Y3RTdGF0aWNTdHJp bmdUYWcpCisgICAgZW51bSBDb25zdHJ1Y3RFbXB0eVN0cmluZ1RhZyB7IENvbnN0cnVjdEVtcHR5 U3RyaW5nIH07CisgICAgU3RyaW5nSW1wbChDb25zdHJ1Y3RFbXB0eVN0cmluZ1RhZykKICAgICAg ICAgOiBtX3JlZkNvdW50KHNfcmVmQ291bnRGbGFnSXNTdGF0aWNTdHJpbmcpCi0gICAgICAgICwg bV9sZW5ndGgobGVuZ3RoKQotICAgICAgICAsIG1fZGF0YTE2KGNoYXJhY3RlcnMpCi0gICAgICAg ICwgbV9oYXNoQW5kRmxhZ3Moc19oYXNoRmxhZ0lzSWRlbnRpZmllciB8IEJ1ZmZlck93bmVkKQot ICAgIHsKLSAgICAgICAgLy8gRW5zdXJlIHRoYXQgdGhlIGhhc2ggaXMgY29tcHV0ZWQgc28gdGhh dCBBdG9taWNTdHJpbmdIYXNoIGNhbiBjYWxsIGV4aXN0aW5nSGFzaCgpCi0gICAgICAgIC8vIHdp dGggaW1wdW5pdHkuIFRoZSBlbXB0eSBzdHJpbmcgaXMgc3BlY2lhbCBiZWNhdXNlIGl0IGlzIG5l dmVyIGVudGVyZWQgaW50bwotICAgICAgICAvLyBBdG9taWNTdHJpbmcncyBIYXNoS2V5LCBidXQg c3RpbGwgbmVlZHMgdG8gY29tcGFyZSBjb3JyZWN0bHkuCi0gICAgICAgIFNUUklOR19TVEFUU19B RERfMTZCSVRfU1RSSU5HKG1fbGVuZ3RoKTsKLQotICAgICAgICBoYXNoKCk7Ci0gICAgfQotCi0g ICAgLy8gVXNlZCB0byBjb25zdHJ1Y3Qgc3RhdGljIHN0cmluZ3MsIHdoaWNoIGhhdmUgYW4gc3Bl Y2lhbCByZWZDb3VudCB0aGF0IGNhbiBuZXZlciBoaXQgemVyby4KLSAgICAvLyBUaGlzIG1lYW5z IHRoYXQgdGhlIHN0YXRpYyBzdHJpbmcgd2lsbCBuZXZlciBiZSBkZXN0cm95ZWQsIHdoaWNoIGlz IGltcG9ydGFudCBiZWNhdXNlCi0gICAgLy8gc3RhdGljIHN0cmluZ3Mgd2lsbCBiZSBzaGFyZWQg YWNyb3NzIHRocmVhZHMgJiByZWYtY291bnRlZCBpbiBhIG5vbi10aHJlYWRzYWZlIG1hbm5lci4K LSAgICBTdHJpbmdJbXBsKGNvbnN0IExDaGFyKiBjaGFyYWN0ZXJzLCB1bnNpZ25lZCBsZW5ndGgs IENvbnN0cnVjdFN0YXRpY1N0cmluZ1RhZykKLSAgICAgICAgOiBtX3JlZkNvdW50KHNfcmVmQ291 bnRGbGFnSXNTdGF0aWNTdHJpbmcpCi0gICAgICAgICwgbV9sZW5ndGgobGVuZ3RoKQotICAgICAg ICAsIG1fZGF0YTgoY2hhcmFjdGVycykKLSAgICAgICAgLCBtX2hhc2hBbmRGbGFncyhzX2hhc2hG bGFnOEJpdEJ1ZmZlciB8IHNfaGFzaEZsYWdJc0lkZW50aWZpZXIgfCBCdWZmZXJPd25lZCkKKyAg ICAgICAgLCBtX2xlbmd0aCgwKQorICAgICAgICAsIG1fZGF0YTgocmVpbnRlcnByZXRfY2FzdDxM Q2hhcio+KDEpKQorICAgICAgICAsIG1faGFzaEFuZEZsYWdzKHNfaGFzaEZsYWc4Qml0QnVmZmVy IHwgc19oYXNoRmxhZ0lzSWRlbnRpZmllciB8IHNfaGFzaEZsYWdJc0F0b21pYyB8IEJ1ZmZlck93 bmVkKQogICAgIHsKICAgICAgICAgLy8gRW5zdXJlIHRoYXQgdGhlIGhhc2ggaXMgY29tcHV0ZWQg c28gdGhhdCBBdG9taWNTdHJpbmdIYXNoIGNhbiBjYWxsIGV4aXN0aW5nSGFzaCgpCiAgICAgICAg IC8vIHdpdGggaW1wdW5pdHkuIFRoZSBlbXB0eSBzdHJpbmcgaXMgc3BlY2lhbCBiZWNhdXNlIGl0 IGlzIG5ldmVyIGVudGVyZWQgaW50bwpJbmRleDogU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdT dGF0aWNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ1N0YXRp Y3MuY3BwCShyZXZpc2lvbiAxNjU3MzkpCisrKyBTb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ1N0 YXRpY3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MywxNSArNDMsNyBAQCBuYW1lc3BhY2UgV1RG IHsKIAogU3RyaW5nSW1wbCogU3RyaW5nSW1wbDo6ZW1wdHkoKQogewotICAgIC8vIEZJWE1FOiBU aGlzIHdvcmtzIGFyb3VuZCBhIGJ1ZyBpbiBvdXIgcG9ydCBvZiBQQ1JFLCB0aGF0IGEgcmVndWxh ciBleHByZXNzaW9uCi0gICAgLy8gcnVuIG9uIHRoZSBlbXB0eSBzdHJpbmcgbWF5IHN0aWxsIHBl cmZvcm0gYSByZWFkIGZyb20gdGhlIGZpcnN0IGVsZW1lbnQsIGFuZAotICAgIC8vIGFzIHN1Y2gg d2UgbmVlZCB0aGlzIHRvIGJlIGEgdmFsaWQgcG9pbnRlci4gTm8gY29kZSBzaG91bGQgZXZlciBi ZSByZWFkaW5nCi0gICAgLy8gZnJvbSBhIHplcm8gbGVuZ3RoIHN0cmluZywgc28gdGhpcyBzaG91 bGQgYmUgYWJsZSB0byBiZSBhIG5vbi1udWxsIHBvaW50ZXIKLSAgICAvLyBpbnRvIHRoZSB6ZXJv LXBhZ2UuCi0gICAgLy8gUmVwbGFjZSB0aGlzIHdpdGggJ3JlaW50ZXJwcmV0X2Nhc3Q8VUNoYXIq PihzdGF0aWNfY2FzdDxpbnRwdHJfdD4oMSkpJyBvbmNlCi0gICAgLy8gUENSRSBnb2VzIGF3YXku Ci0gICAgc3RhdGljIExDaGFyIGVtcHR5TENoYXJEYXRhID0gMDsKLSAgICBERVBSRUNBVEVEX0RF RklORV9TVEFUSUNfTE9DQUwoU3RyaW5nSW1wbCwgZW1wdHlTdHJpbmcsICgmZW1wdHlMQ2hhckRh dGEsIDAsIENvbnN0cnVjdFN0YXRpY1N0cmluZykpOworICAgIERFUFJFQ0FURURfREVGSU5FX1NU QVRJQ19MT0NBTChTdHJpbmdJbXBsLCBlbXB0eVN0cmluZywgKENvbnN0cnVjdEVtcHR5U3RyaW5n KSk7CiAgICAgV1RGX0FOTk9UQVRFX0JFTklHTl9SQUNFKCZlbXB0eVN0cmluZywgIkJlbmlnbiBy YWNlIG9uIFN0cmluZ0ltcGw6OmVtcHR5U3RyaW5nIHJlZmVyZW5jZSBjb3VudGVyIik7CiAgICAg cmV0dXJuICZlbXB0eVN0cmluZzsKIH0K 227148 2014-03-18 19:41:44 -0700 2014-03-18 19:41:44 -0700 Patch with review comments for EWS 130438.2.patch text/plain 5855 barraclough SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNjU4NjEpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE0LTAzLTE4ICBHYXZpbiBCYXJyYWNsb3VnaCAg PGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBTbWFsbCBjbGVhbnVwIG9mIGVtcHR5 IHN0cmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTMwNDM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzb24uCisKKyAgICAgICAg VGhlIGVtcHR5IHN0cmluZyBpcyB3ZWlyZCBiZWN1YXNlIGl0IGlzIHVzZWQgYXMgdGhlIGltcGwg Zm9yIGFuIEF0b21pY1N0cmluZywgYnV0IGlzQXRvbWljKCkKKyAgICAgICAgcmV0dXJucyBmYWxz ZS4KKyAgICAgICAgQWxzbywgd2Ugc2V0IGEgdmFsaWQgcG9pbnRlciBmb3IgdGhlIGNoYXJhY3Rl cnMgcG9pbnRlciBkdWUgdG8gYW4gb2xkIFBDUkUgYnVnOyByZW1vdmUgdGhpcy4KKyAgICAgICAg QWxzbywgd2UgY3VycmVudGx5IG9ubHkgY3JlYXRlIG9uZSAnc3RhdGljJyBzdHJpbmcsIHRoZSBl bXB0eSBzdHJpbmcuIEFkZGluZyBtb3JlIG1pZ2h0IGJyZWFrCisgICAgICAgIGFzc3VtdGlvbnMs IGluaGliaXQgdGhlIGNvbnN0cnVjdG9yIGZyb20gYmVpbmcgdXNlZCB0byBjcmVhdGUgb3RoZXIg c3RhdGljIHN0cmluZ3MgZm9yIG5vdy4KKworICAgICAgICAqIHd0Zi90ZXh0L0F0b21pY1N0cmlu Zy5oOgorICAgICAgICAoV1RGOjpBdG9taWNTdHJpbmc6OmFkZCk6CisgICAgICAgICAgICAtIHVw ZGF0ZSBhc3NlcnQuCisgICAgICAgICogd3RmL3RleHQvU3RyaW5nSW1wbC5oOgorICAgICAgICAo V1RGOjpTdHJpbmdJbXBsOjpTdHJpbmdJbXBsKToKKyAgICAgICAgICAgIC0gTWVyZ2UgQ29uc3Ry dWN0U3RhdGljU3RyaW5nIGNvbnN0cnVjdG9ycywgb25seSBhbGxvdyB0aGUgZW1wdHkgc3RhdGlj IHN0cmluZyB0byBiZSBjb25zdHJ1Y3RlZC4KKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdTdGF0 aWNzLmNwcDoKKyAgICAgICAgKFdURjo6U3RyaW5nSW1wbDo6ZW1wdHkpOgorICAgICAgICAgICAg LSBDb25zdHJ1Y3RTdGF0aWNTdHJpbmcgLT4gQ29uc3RydWN0RW1wdHlTdHJpbmcsIHJlbW92ZSBh cmd1bWVudHMsIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTCAtPiBOZXZlckRlc3Ryb3ll ZC4KKwogMjAxNC0wMy0xOCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgUmVkdWNlIHVzZSBvZiBkZXByZWNhdGVkQ2hhcmFjdGVycyBpbiBXZWJDb3JlCkluZGV4OiBT b3VyY2UvV1RGL3d0Zi90ZXh0L0F0b21pY1N0cmluZy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X VEYvd3RmL3RleHQvQXRvbWljU3RyaW5nLmgJKHJldmlzaW9uIDE2NTczOSkKKysrIFNvdXJjZS9X VEYvd3RmL3RleHQvQXRvbWljU3RyaW5nLmgJKHdvcmtpbmcgY29weSkKQEAgLTE4NSw3ICsxODUs NyBAQCBwcml2YXRlOgogICAgIEFMV0FZU19JTkxJTkUgc3RhdGljIFBhc3NSZWZQdHI8U3RyaW5n SW1wbD4gYWRkKFN0cmluZ0ltcGwqIHN0cmluZykKICAgICB7CiAgICAgICAgIGlmICghc3RyaW5n IHx8IHN0cmluZy0+aXNBdG9taWMoKSkgewotICAgICAgICAgICAgQVNTRVJUX1dJVEhfTUVTU0FH RSghc3RyaW5nIHx8IGlzSW5BdG9taWNTdHJpbmdUYWJsZShzdHJpbmcpLCAiVGhlIGF0b21pYyBz dHJpbmcgY29tZXMgZnJvbSBhbiBvdGhlciB0aHJlYWQhIik7CisgICAgICAgICAgICBBU1NFUlRf V0lUSF9NRVNTQUdFKCFzdHJpbmcgfHwgc3RyaW5nID09IFN0cmluZ0ltcGw6OmVtcHR5KCkgfHwg aXNJbkF0b21pY1N0cmluZ1RhYmxlKHN0cmluZyksICJUaGUgYXRvbWljIHN0cmluZyBjb21lcyBm cm9tIGFuIG90aGVyIHRocmVhZCEiKTsKICAgICAgICAgICAgIHJldHVybiBzdHJpbmc7CiAgICAg ICAgIH0KICAgICAgICAgcmV0dXJuIGFkZFNsb3dDYXNlKHN0cmluZyk7CkluZGV4OiBTb3VyY2Uv V1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi90 ZXh0L1N0cmluZ0ltcGwuaAkocmV2aXNpb24gMTY1NzM5KQorKysgU291cmNlL1dURi93dGYvdGV4 dC9TdHJpbmdJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTE1NywyOSArMTU3LDEzIEBAIHByaXZh dGU6CiAgICAgLy8gVXNlZCB0byBjb25zdHJ1Y3Qgc3RhdGljIHN0cmluZ3MsIHdoaWNoIGhhdmUg YW4gc3BlY2lhbCByZWZDb3VudCB0aGF0IGNhbiBuZXZlciBoaXQgemVyby4KICAgICAvLyBUaGlz IG1lYW5zIHRoYXQgdGhlIHN0YXRpYyBzdHJpbmcgd2lsbCBuZXZlciBiZSBkZXN0cm95ZWQsIHdo aWNoIGlzIGltcG9ydGFudCBiZWNhdXNlCiAgICAgLy8gc3RhdGljIHN0cmluZ3Mgd2lsbCBiZSBz aGFyZWQgYWNyb3NzIHRocmVhZHMgJiByZWYtY291bnRlZCBpbiBhIG5vbi10aHJlYWRzYWZlIG1h bm5lci4KLSAgICBlbnVtIENvbnN0cnVjdFN0YXRpY1N0cmluZ1RhZyB7IENvbnN0cnVjdFN0YXRp Y1N0cmluZyB9OwotICAgIFN0cmluZ0ltcGwoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHVuc2ln bmVkIGxlbmd0aCwgQ29uc3RydWN0U3RhdGljU3RyaW5nVGFnKQorICAgIGZyaWVuZCBjbGFzcyBO ZXZlckRlc3Ryb3llZDxTdHJpbmdJbXBsPjsKKyAgICBlbnVtIENvbnN0cnVjdEVtcHR5U3RyaW5n VGFnIHsgQ29uc3RydWN0RW1wdHlTdHJpbmcgfTsKKyAgICBTdHJpbmdJbXBsKENvbnN0cnVjdEVt cHR5U3RyaW5nVGFnKQogICAgICAgICA6IG1fcmVmQ291bnQoc19yZWZDb3VudEZsYWdJc1N0YXRp Y1N0cmluZykKLSAgICAgICAgLCBtX2xlbmd0aChsZW5ndGgpCi0gICAgICAgICwgbV9kYXRhMTYo Y2hhcmFjdGVycykKLSAgICAgICAgLCBtX2hhc2hBbmRGbGFncyhzX2hhc2hGbGFnSXNJZGVudGlm aWVyIHwgQnVmZmVyT3duZWQpCi0gICAgewotICAgICAgICAvLyBFbnN1cmUgdGhhdCB0aGUgaGFz aCBpcyBjb21wdXRlZCBzbyB0aGF0IEF0b21pY1N0cmluZ0hhc2ggY2FuIGNhbGwgZXhpc3RpbmdI YXNoKCkKLSAgICAgICAgLy8gd2l0aCBpbXB1bml0eS4gVGhlIGVtcHR5IHN0cmluZyBpcyBzcGVj aWFsIGJlY2F1c2UgaXQgaXMgbmV2ZXIgZW50ZXJlZCBpbnRvCi0gICAgICAgIC8vIEF0b21pY1N0 cmluZydzIEhhc2hLZXksIGJ1dCBzdGlsbCBuZWVkcyB0byBjb21wYXJlIGNvcnJlY3RseS4KLSAg ICAgICAgU1RSSU5HX1NUQVRTX0FERF8xNkJJVF9TVFJJTkcobV9sZW5ndGgpOwotCi0gICAgICAg IGhhc2goKTsKLSAgICB9Ci0KLSAgICAvLyBVc2VkIHRvIGNvbnN0cnVjdCBzdGF0aWMgc3RyaW5n cywgd2hpY2ggaGF2ZSBhbiBzcGVjaWFsIHJlZkNvdW50IHRoYXQgY2FuIG5ldmVyIGhpdCB6ZXJv LgotICAgIC8vIFRoaXMgbWVhbnMgdGhhdCB0aGUgc3RhdGljIHN0cmluZyB3aWxsIG5ldmVyIGJl IGRlc3Ryb3llZCwgd2hpY2ggaXMgaW1wb3J0YW50IGJlY2F1c2UKLSAgICAvLyBzdGF0aWMgc3Ry aW5ncyB3aWxsIGJlIHNoYXJlZCBhY3Jvc3MgdGhyZWFkcyAmIHJlZi1jb3VudGVkIGluIGEgbm9u LXRocmVhZHNhZmUgbWFubmVyLgotICAgIFN0cmluZ0ltcGwoY29uc3QgTENoYXIqIGNoYXJhY3Rl cnMsIHVuc2lnbmVkIGxlbmd0aCwgQ29uc3RydWN0U3RhdGljU3RyaW5nVGFnKQotICAgICAgICA6 IG1fcmVmQ291bnQoc19yZWZDb3VudEZsYWdJc1N0YXRpY1N0cmluZykKLSAgICAgICAgLCBtX2xl bmd0aChsZW5ndGgpCi0gICAgICAgICwgbV9kYXRhOChjaGFyYWN0ZXJzKQotICAgICAgICAsIG1f aGFzaEFuZEZsYWdzKHNfaGFzaEZsYWc4Qml0QnVmZmVyIHwgc19oYXNoRmxhZ0lzSWRlbnRpZmll ciB8IEJ1ZmZlck93bmVkKQorICAgICAgICAsIG1fbGVuZ3RoKDApCisgICAgICAgICwgbV9kYXRh OChyZWludGVycHJldF9jYXN0PGNvbnN0IExDaGFyKj4oJm1fbGVuZ3RoKSkKKyAgICAgICAgLCBt X2hhc2hBbmRGbGFncyhzX2hhc2hGbGFnOEJpdEJ1ZmZlciB8IHNfaGFzaEZsYWdJc0lkZW50aWZp ZXIgfCBzX2hhc2hGbGFnSXNBdG9taWMgfCBCdWZmZXJPd25lZCkKICAgICB7CiAgICAgICAgIC8v IEVuc3VyZSB0aGF0IHRoZSBoYXNoIGlzIGNvbXB1dGVkIHNvIHRoYXQgQXRvbWljU3RyaW5nSGFz aCBjYW4gY2FsbCBleGlzdGluZ0hhc2goKQogICAgICAgICAvLyB3aXRoIGltcHVuaXR5LiBUaGUg ZW1wdHkgc3RyaW5nIGlzIHNwZWNpYWwgYmVjYXVzZSBpdCBpcyBuZXZlciBlbnRlcmVkIGludG8K SW5kZXg6IFNvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nU3RhdGljcy5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdTdGF0aWNzLmNwcAkocmV2aXNpb24gMTY1NzM5 KQorKysgU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdTdGF0aWNzLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgIkF0b21pY1N0cmluZy5oIgogI2luY2x1ZGUg IkR5bmFtaWNBbm5vdGF0aW9ucy5oIgogI2luY2x1ZGUgIk1haW5UaHJlYWQuaCIKKyNpbmNsdWRl ICJOZXZlckRlc3Ryb3llZC5oIgogI2luY2x1ZGUgIlN0YXRpY0NvbnN0cnVjdG9ycy5oIgogI2lu Y2x1ZGUgIlN0cmluZ0ltcGwuaCIKIApAQCAtNDMsMTcgKzQ0LDkgQEAgbmFtZXNwYWNlIFdURiB7 CiAKIFN0cmluZ0ltcGwqIFN0cmluZ0ltcGw6OmVtcHR5KCkKIHsKLSAgICAvLyBGSVhNRTogVGhp cyB3b3JrcyBhcm91bmQgYSBidWcgaW4gb3VyIHBvcnQgb2YgUENSRSwgdGhhdCBhIHJlZ3VsYXIg ZXhwcmVzc2lvbgotICAgIC8vIHJ1biBvbiB0aGUgZW1wdHkgc3RyaW5nIG1heSBzdGlsbCBwZXJm b3JtIGEgcmVhZCBmcm9tIHRoZSBmaXJzdCBlbGVtZW50LCBhbmQKLSAgICAvLyBhcyBzdWNoIHdl IG5lZWQgdGhpcyB0byBiZSBhIHZhbGlkIHBvaW50ZXIuIE5vIGNvZGUgc2hvdWxkIGV2ZXIgYmUg cmVhZGluZwotICAgIC8vIGZyb20gYSB6ZXJvIGxlbmd0aCBzdHJpbmcsIHNvIHRoaXMgc2hvdWxk IGJlIGFibGUgdG8gYmUgYSBub24tbnVsbCBwb2ludGVyCi0gICAgLy8gaW50byB0aGUgemVyby1w YWdlLgotICAgIC8vIFJlcGxhY2UgdGhpcyB3aXRoICdyZWludGVycHJldF9jYXN0PFVDaGFyKj4o c3RhdGljX2Nhc3Q8aW50cHRyX3Q+KDEpKScgb25jZQotICAgIC8vIFBDUkUgZ29lcyBhd2F5Lgot ICAgIHN0YXRpYyBMQ2hhciBlbXB0eUxDaGFyRGF0YSA9IDA7Ci0gICAgREVQUkVDQVRFRF9ERUZJ TkVfU1RBVElDX0xPQ0FMKFN0cmluZ0ltcGwsIGVtcHR5U3RyaW5nLCAoJmVtcHR5TENoYXJEYXRh LCAwLCBDb25zdHJ1Y3RTdGF0aWNTdHJpbmcpKTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8 U3RyaW5nSW1wbD4gZW1wdHlTdHJpbmcoQ29uc3RydWN0RW1wdHlTdHJpbmcpOwogICAgIFdURl9B Tk5PVEFURV9CRU5JR05fUkFDRSgmZW1wdHlTdHJpbmcsICJCZW5pZ24gcmFjZSBvbiBTdHJpbmdJ bXBsOjplbXB0eVN0cmluZyByZWZlcmVuY2UgY291bnRlciIpOwotICAgIHJldHVybiAmZW1wdHlT dHJpbmc7CisgICAgcmV0dXJuICZlbXB0eVN0cmluZy5nZXQoKTsKIH0KIAogV1RGX0VYUE9SVERB VEEgREVGSU5FX0dMT0JBTChBdG9taWNTdHJpbmcsIG51bGxBdG9tKQo=