62660 2011-06-14 12:57:52 -0700 Move string ArgumentCoder template specializations out into a .cpp file 2011-06-14 13:21:01 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 420668 0 andersca 2011-06-14 12:57:52 -0700 Move string ArgumentCoder template specializations out into a .cpp file 420675 1 97158 andersca 2011-06-14 13:02:31 -0700 Created attachment 97158 Patch 420688 2 andersca 2011-06-14 13:21:01 -0700 Committed r88846: <http://trac.webkit.org/changeset/88846> 97158 2011-06-14 13:02:31 -0700 2011-06-14 13:07:29 -0700 Patch bug-62660-20110614130235.patch text/plain 14635 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4ODQzKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDYtMTQgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIHN0cmluZyBBcmd1bWVudENvZGVyIHRlbXBsYXRl IHNwZWNpYWxpemF0aW9ucyBvdXQgaW50byBhIC5jcHAgZmlsZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI2NjAKKworICAgICAgICAqIEdOVW1ha2Vm aWxlLmFtOgorICAgICAgICAqIFBsYXRmb3JtL0NvcmVJUEMvQXJndW1lbnRDb2RlcnMuY3BwOiBB ZGRlZC4KKyAgICAgICAgKENvcmVJUEM6Ojo6ZW5jb2RlKToKKyAgICAgICAgKENvcmVJUEM6Ojo6 ZGVjb2RlKToKKyAgICAgICAgKiBQbGF0Zm9ybS9Db3JlSVBDL0FyZ3VtZW50Q29kZXJzLmg6Cisg ICAgICAgICogV2ViS2l0Mi5wcm86CisgICAgICAgICogV2ViS2l0Mi54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qOgorICAgICAgICAqIHdpbi9XZWJLaXQyLnZjcHJvajoKKwogMjAxMS0wNi0xNCAg QW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IFNhbSBXZWluaWcuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5hbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5hbQkocmV2aXNpb24gODg4Mzgp CisrKyBTb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5hbQkod29ya2luZyBjb3B5KQpAQCAtNzYs NiArNzYsNyBAQCBsaWJ3ZWJraXQyZ3RrX0BXRUJLSVRHVEtfQVBJX01BSk9SX1ZFUlNJCiAJU291 cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdGVycm9yLmggXAogCVNvdXJjZS9XZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXRlcnJvci5jcHAgXAogCVNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJ UEMvQXJndW1lbnRDb2Rlci5oIFwKKwlTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0Fy Z3VtZW50Q29kZXJzLmNwcCBcCiAJU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9Bcmd1 bWVudENvZGVycy5oIFwKIAlTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0FyZ3VtZW50 RGVjb2Rlci5jcHAgXAogCVNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQXJndW1lbnRE ZWNvZGVyLmggXApJbmRleDogU291cmNlL1dlYktpdDIvV2ViS2l0Mi5wcm8KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViS2l0Mi5wcm8JKHJldmlzaW9uIDg4ODM4KQorKysgU291cmNl L1dlYktpdDIvV2ViS2l0Mi5wcm8JKHdvcmtpbmcgY29weSkKQEAgLTMwMyw2ICszMDMsNyBAQCBI RUFERVJTICs9IFwKICAgICAkJFdFQktJVDJfR0VORVJBVEVEX0hFQURFUlMKIAogU09VUkNFUyAr PSBcCisgICAgUGxhdGZvcm0vQ29yZUlQQy9Bcmd1bWVudENvZGVycy5jcHAgXAogICAgIFBsYXRm b3JtL0NvcmVJUEMvQXJndW1lbnREZWNvZGVyLmNwcCBcCiAgICAgUGxhdGZvcm0vQ29yZUlQQy9B cmd1bWVudEVuY29kZXIuY3BwIFwKICAgICBQbGF0Zm9ybS9Db3JlSVBDL0F0dGFjaG1lbnQuY3Bw IFwKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQXJndW1lbnRDb2RlcnMu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQXJndW1l bnRDb2RlcnMuY3BwCShyZXZpc2lvbiAwKQorKysgU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29y ZUlQQy9Bcmd1bWVudENvZGVycy5jcHAJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTMwIEBACisv KgorICogQ29weXJpZ2h0IChDKSAyMDExIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlz dHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0 CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCBy ZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9j dW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3Ry aWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4g QU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1Q TElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJ TVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBB UlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQ UExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNU LCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VR VUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1F TlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRB LCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNU LCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhF UldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZU V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUgIkFyZ3VtZW50Q29kZXJz LmgiCisKKyNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CisjaW5jbHVkZSA8d3RmL3RleHQv V1RGU3RyaW5nLmg+CisKK25hbWVzcGFjZSBDb3JlSVBDIHsKKwordm9pZCBBcmd1bWVudENvZGVy PEF0b21pY1N0cmluZz46OmVuY29kZShBcmd1bWVudEVuY29kZXIqIGVuY29kZXIsIGNvbnN0IEF0 b21pY1N0cmluZyYgYXRvbWljU3RyaW5nKQoreworICAgIGVuY29kZXItPmVuY29kZShhdG9taWNT dHJpbmcuc3RyaW5nKCkpOworfQorCitib29sIEFyZ3VtZW50Q29kZXI8QXRvbWljU3RyaW5nPjo6 ZGVjb2RlKEFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgQXRvbWljU3RyaW5nJiBhdG9taWNTdHJp bmcpCit7CisgICAgU3RyaW5nIHN0cmluZzsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZShzdHJp bmcpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBhdG9taWNTdHJpbmcgPSBzdHJpbmc7 CisgICAgcmV0dXJuIHRydWU7Cit9CisKK3ZvaWQgQXJndW1lbnRDb2RlcjxDU3RyaW5nPjo6ZW5j b2RlKEFyZ3VtZW50RW5jb2RlciogZW5jb2RlciwgY29uc3QgQ1N0cmluZyYgc3RyaW5nKQorewor ICAgIC8vIFNwZWNpYWwgY2FzZSB0aGUgbnVsbCBzdHJpbmcuCisgICAgaWYgKHN0cmluZy5pc051 bGwoKSkgeworICAgICAgICBlbmNvZGVyLT5lbmNvZGVVSW50MzIoc3RkOjpudW1lcmljX2xpbWl0 czx1aW50MzJfdD46Om1heCgpKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIHVpbnQz Ml90IGxlbmd0aCA9IHN0cmluZy5sZW5ndGgoKTsKKyAgICBlbmNvZGVyLT5lbmNvZGUobGVuZ3Ro KTsKKyAgICBlbmNvZGVyLT5lbmNvZGVCeXRlcyhyZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQ4 X3QqPihzdHJpbmcuZGF0YSgpKSwgbGVuZ3RoKTsKK30KKworYm9vbCBBcmd1bWVudENvZGVyPENT dHJpbmc+OjpkZWNvZGUoQXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBDU3RyaW5nJiByZXN1bHQp Cit7CisgICAgdWludDMyX3QgbGVuZ3RoOworICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKGxlbmd0 aCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmIChsZW5ndGggPT0gc3RkOjpudW1l cmljX2xpbWl0czx1aW50MzJfdD46Om1heCgpKSB7CisgICAgICAgIC8vIFRoaXMgaXMgdGhlIG51 bGwgc3RyaW5nLgorICAgICAgICByZXN1bHQgPSBDU3RyaW5nKCk7CisgICAgICAgIHJldHVybiB0 cnVlOworICAgIH0KKworICAgIC8vIEJlZm9yZSBhbGxvY2F0aW5nIHRoZSBzdHJpbmcsIG1ha2Ug c3VyZSB0aGF0IHRoZSBkZWNvZGVyIGJ1ZmZlciBpcyBiaWcgZW5vdWdoLgorICAgIGlmICghZGVj b2Rlci0+YnVmZmVySXNMYXJnZUVub3VnaFRvQ29udGFpbjxjaGFyPihsZW5ndGgpKSB7CisgICAg ICAgIGRlY29kZXItPm1hcmtJbnZhbGlkKCk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9 CisKKyAgICBjaGFyKiBidWZmZXI7CisgICAgQ1N0cmluZyBzdHJpbmcgPSBDU3RyaW5nOjpuZXdV bmluaXRpYWxpemVkKGxlbmd0aCwgYnVmZmVyKTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZUJ5 dGVzKHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KGJ1ZmZlciksIGxlbmd0aCkpCisgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgIHJlc3VsdCA9IHN0cmluZzsKKyAgICByZXR1cm4gdHJ1ZTsK K30KKworCit2b2lkIEFyZ3VtZW50Q29kZXI8U3RyaW5nPjo6ZW5jb2RlKEFyZ3VtZW50RW5jb2Rl ciogZW5jb2RlciwgY29uc3QgU3RyaW5nJiBzdHJpbmcpCit7CisgICAgLy8gU3BlY2lhbCBjYXNl IHRoZSBudWxsIHN0cmluZy4KKyAgICBpZiAoc3RyaW5nLmlzTnVsbCgpKSB7CisgICAgICAgIGVu Y29kZXItPmVuY29kZVVJbnQzMihzdGQ6Om51bWVyaWNfbGltaXRzPHVpbnQzMl90Pjo6bWF4KCkp OworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgdWludDMyX3QgbGVuZ3RoID0gc3RyaW5n Lmxlbmd0aCgpOworICAgIGVuY29kZXItPmVuY29kZShsZW5ndGgpOworICAgIGVuY29kZXItPmVu Y29kZUJ5dGVzKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KHN0cmluZy5jaGFyYWN0 ZXJzKCkpLCBsZW5ndGggKiBzaXplb2YoVUNoYXIpKTsKK30KKworYm9vbCBBcmd1bWVudENvZGVy PFN0cmluZz46OmRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIFN0cmluZyYgcmVzdWx0 KQoreworICAgIHVpbnQzMl90IGxlbmd0aDsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZShsZW5n dGgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAobGVuZ3RoID09IHN0ZDo6bnVt ZXJpY19saW1pdHM8dWludDMyX3Q+OjptYXgoKSkgeworICAgICAgICAvLyBUaGlzIGlzIHRoZSBu dWxsIHN0cmluZy4KKyAgICAgICAgcmVzdWx0ID0gU3RyaW5nKCk7CisgICAgICAgIHJldHVybiB0 cnVlOworICAgIH0KKworICAgIC8vIEJlZm9yZSBhbGxvY2F0aW5nIHRoZSBzdHJpbmcsIG1ha2Ug c3VyZSB0aGF0IHRoZSBkZWNvZGVyIGJ1ZmZlciBpcyBiaWcgZW5vdWdoLgorICAgIGlmICghZGVj b2Rlci0+YnVmZmVySXNMYXJnZUVub3VnaFRvQ29udGFpbjxVQ2hhcj4obGVuZ3RoKSkgeworICAg ICAgICBkZWNvZGVyLT5tYXJrSW52YWxpZCgpOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg fQorICAgIAorICAgIFVDaGFyKiBidWZmZXI7CisgICAgU3RyaW5nIHN0cmluZyA9IFN0cmluZzo6 Y3JlYXRlVW5pbml0aWFsaXplZChsZW5ndGgsIGJ1ZmZlcik7CisgICAgaWYgKCFkZWNvZGVyLT5k ZWNvZGVCeXRlcyhyZWludGVycHJldF9jYXN0PHVpbnQ4X3QqPihidWZmZXIpLCBsZW5ndGggKiBz aXplb2YoVUNoYXIpKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIAorICAgIHJlc3VsdCA9 IHN0cmluZzsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKworfSAvLyBuYW1lc3BhY2UgQ29yZUlQQwpJ bmRleDogU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9Bcmd1bWVudENvZGVycy5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQXJndW1lbnRDb2Rl cnMuaAkocmV2aXNpb24gODg4MzgpCisrKyBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBD L0FyZ3VtZW50Q29kZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI5LDEyICsyOSwxMCBAQAogI2lu Y2x1ZGUgIkFyZ3VtZW50RGVjb2Rlci5oIgogI2luY2x1ZGUgIkFyZ3VtZW50RW5jb2Rlci5oIgog I2luY2x1ZGUgPHV0aWxpdHk+CisjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KICNpbmNsdWRlIDx3 dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9UeXBlVHJhaXRzLmg+CiAjaW5jbHVkZSA8d3Rm L1ZlY3Rvci5oPgotI2luY2x1ZGUgPHd0Zi90ZXh0L0F0b21pY1N0cmluZy5oPgotI2luY2x1ZGUg PHd0Zi90ZXh0L0NTdHJpbmcuaD4KLSNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAog bmFtZXNwYWNlIENvcmVJUEMgewogCkBAIC0xOTUsMTA1ICsxOTMsMTkgQEAgdGVtcGxhdGU8dHlw ZW5hbWUgS2V5QXJnLCB0eXBlbmFtZSBNYXBwZQogICAgIH0KIH07CiAKLXRlbXBsYXRlPD4gc3Ry dWN0IEFyZ3VtZW50Q29kZXI8Q1N0cmluZz4gewotICAgIHN0YXRpYyB2b2lkIGVuY29kZShBcmd1 bWVudEVuY29kZXIqIGVuY29kZXIsIGNvbnN0IENTdHJpbmcmIHN0cmluZykKLSAgICB7Ci0gICAg ICAgIC8vIFNwZWNpYWwgY2FzZSB0aGUgbnVsbCBzdHJpbmcuCi0gICAgICAgIGlmIChzdHJpbmcu aXNOdWxsKCkpIHsKLSAgICAgICAgICAgIGVuY29kZXItPmVuY29kZVVJbnQzMihzdGQ6Om51bWVy aWNfbGltaXRzPHVpbnQzMl90Pjo6bWF4KCkpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICB9Ci0KLSAgICAgICAgdWludDMyX3QgbGVuZ3RoID0gc3RyaW5nLmxlbmd0aCgpOwotICAgICAg ICBlbmNvZGVyLT5lbmNvZGUobGVuZ3RoKTsKLSAgICAgICAgZW5jb2Rlci0+ZW5jb2RlQnl0ZXMo cmVpbnRlcnByZXRfY2FzdDxjb25zdCB1aW50OF90Kj4oc3RyaW5nLmRhdGEoKSksIGxlbmd0aCk7 Ci0gICAgfQotCi0gICAgc3RhdGljIGJvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2RlciogZGVjb2Rl ciwgQ1N0cmluZyYgcmVzdWx0KQotICAgIHsKLSAgICAgICAgdWludDMyX3QgbGVuZ3RoOwotICAg ICAgICBpZiAoIWRlY29kZXItPmRlY29kZShsZW5ndGgpKQotICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwotCi0gICAgICAgIGlmIChsZW5ndGggPT0gc3RkOjpudW1lcmljX2xpbWl0czx1aW50MzJf dD46Om1heCgpKSB7Ci0gICAgICAgICAgICAvLyBUaGlzIGlzIHRoZSBudWxsIHN0cmluZy4KLSAg ICAgICAgICAgIHJlc3VsdCA9IENTdHJpbmcoKTsKLSAgICAgICAgICAgIHJldHVybiB0cnVlOwot ICAgICAgICB9Ci0KLSAgICAgICAgLy8gQmVmb3JlIGFsbG9jYXRpbmcgdGhlIHN0cmluZywgbWFr ZSBzdXJlIHRoYXQgdGhlIGRlY29kZXIgYnVmZmVyIGlzIGJpZyBlbm91Z2guCi0gICAgICAgIGlm ICghZGVjb2Rlci0+YnVmZmVySXNMYXJnZUVub3VnaFRvQ29udGFpbjxjaGFyPihsZW5ndGgpKSB7 Ci0gICAgICAgICAgICBkZWNvZGVyLT5tYXJrSW52YWxpZCgpOwotICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwotICAgICAgICB9Ci0KLSAgICAgICAgY2hhciogYnVmZmVyOwotICAgICAgICBDU3Ry aW5nIHN0cmluZyA9IENTdHJpbmc6Om5ld1VuaW5pdGlhbGl6ZWQobGVuZ3RoLCBidWZmZXIpOwot ICAgICAgICBpZiAoIWRlY29kZXItPmRlY29kZUJ5dGVzKHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhf dCo+KGJ1ZmZlciksIGxlbmd0aCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAg ICAgcmVzdWx0ID0gc3RyaW5nOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Cit0ZW1wbGF0 ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPEF0b21pY1N0cmluZz4geworICAgIHN0YXRpYyB2b2lk IGVuY29kZShBcmd1bWVudEVuY29kZXIqLCBjb25zdCBBdG9taWNTdHJpbmcmKTsKKyAgICBzdGF0 aWMgYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyKiwgQXRvbWljU3RyaW5nJik7CiB9OwogCi10 ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFN0cmluZz4gewotICAgIHN0YXRpYyB2b2lk IGVuY29kZShBcmd1bWVudEVuY29kZXIqIGVuY29kZXIsIGNvbnN0IFN0cmluZyYgc3RyaW5nKQot ICAgIHsKLSAgICAgICAgLy8gU3BlY2lhbCBjYXNlIHRoZSBudWxsIHN0cmluZy4KLSAgICAgICAg aWYgKHN0cmluZy5pc051bGwoKSkgewotICAgICAgICAgICAgZW5jb2Rlci0+ZW5jb2RlVUludDMy KHN0ZDo6bnVtZXJpY19saW1pdHM8dWludDMyX3Q+OjptYXgoKSk7Ci0gICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIH0KLQotICAgICAgICB1aW50MzJfdCBsZW5ndGggPSBzdHJpbmcubGVuZ3Ro KCk7Ci0gICAgICAgIGVuY29kZXItPmVuY29kZShsZW5ndGgpOwotICAgICAgICBlbmNvZGVyLT5l bmNvZGVCeXRlcyhyZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPihzdHJpbmcuY2hhcmFj dGVycygpKSwgbGVuZ3RoICogc2l6ZW9mKFVDaGFyKSk7Ci0gICAgfQotICAgIAotICAgIHN0YXRp YyBib29sIGRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIFN0cmluZyYgcmVzdWx0KQot ICAgIHsKLSAgICAgICAgdWludDMyX3QgbGVuZ3RoOwotICAgICAgICBpZiAoIWRlY29kZXItPmRl Y29kZShsZW5ndGgpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgICAgIGlmIChs ZW5ndGggPT0gc3RkOjpudW1lcmljX2xpbWl0czx1aW50MzJfdD46Om1heCgpKSB7Ci0gICAgICAg ICAgICAvLyBUaGlzIGlzIHRoZSBudWxsIHN0cmluZy4KLSAgICAgICAgICAgIHJlc3VsdCA9IFN0 cmluZygpOwotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0KLQotICAgICAgICAv LyBCZWZvcmUgYWxsb2NhdGluZyB0aGUgc3RyaW5nLCBtYWtlIHN1cmUgdGhhdCB0aGUgZGVjb2Rl ciBidWZmZXIgaXMgYmlnIGVub3VnaC4KLSAgICAgICAgaWYgKCFkZWNvZGVyLT5idWZmZXJJc0xh cmdlRW5vdWdoVG9Db250YWluPFVDaGFyPihsZW5ndGgpKSB7Ci0gICAgICAgICAgICBkZWNvZGVy LT5tYXJrSW52YWxpZCgpOwotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICB9Ci0g ICAgICAgIAotICAgICAgICBVQ2hhciogYnVmZmVyOwotICAgICAgICBTdHJpbmcgc3RyaW5nID0g U3RyaW5nOjpjcmVhdGVVbmluaXRpYWxpemVkKGxlbmd0aCwgYnVmZmVyKTsKLSAgICAgICAgaWYg KCFkZWNvZGVyLT5kZWNvZGVCeXRlcyhyZWludGVycHJldF9jYXN0PHVpbnQ4X3QqPihidWZmZXIp LCBsZW5ndGggKiBzaXplb2YoVUNoYXIpKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAg ICAgICAgCi0gICAgICAgIHJlc3VsdCA9IHN0cmluZzsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0g ICAgfQordGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRDb2RlcjxDU3RyaW5nPiB7CisgICAgc3Rh dGljIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciosIGNvbnN0IENTdHJpbmcmKTsKKyAgICBz dGF0aWMgYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyKiwgQ1N0cmluZyYpOwogfTsKIAotdGVt cGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRDb2RlcjxBdG9taWNTdHJpbmc+IHsKLSAgICBzdGF0aWMg dm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVyKiBlbmNvZGVyLCBjb25zdCBBdG9taWNTdHJpbmcm IGF0b21pY1N0cmluZykKLSAgICB7Ci0gICAgICAgIGVuY29kZXItPmVuY29kZShhdG9taWNTdHJp bmcuc3RyaW5nKCkpOwotICAgIH0KLQotICAgIHN0YXRpYyBib29sIGRlY29kZShBcmd1bWVudERl Y29kZXIqIGRlY29kZXIsIEF0b21pY1N0cmluZyYgYXRvbWljU3RyaW5nKQotICAgIHsKLSAgICAg ICAgU3RyaW5nIHN0cmluZzsKLSAgICAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUoc3RyaW5nKSkK LSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgICAgICBhdG9taWNTdHJpbmcgPSBzdHJp bmc7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KK3RlbXBsYXRlPD4gc3RydWN0IEFyZ3Vt ZW50Q29kZXI8U3RyaW5nPiB7CisgICAgc3RhdGljIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2Rl ciosIGNvbnN0IFN0cmluZyYpOworICAgIHN0YXRpYyBib29sIGRlY29kZShBcmd1bWVudERlY29k ZXIqLCBTdHJpbmcmKTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIENvcmVJUEMKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJldmlz aW9uIDg4ODM4KQorKysgU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5w Ynhwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIsNiArMTAyLDcgQEAKIAkJMUEzOTc5RjcxMzMy OTgzRjAwRTAwMzAwIC8qIFF1YXJ0ekNvcmUuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFBMUNDNUMxMDBGQTFBMTAwNzhERUJDIC8q IFF1YXJ0ekNvcmUuZnJhbWV3b3JrICovOyB9OwogCQkxQTNENjEwMTEzQTdDQzJBMDBGOTVENEUg LyogUGx1Z2luTW9kdWxlSW5mby5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSAxQTNENjBGRjEzQTdDQzJBMDBGOTVENEUgLyogUGx1Z2luTW9kdWxlSW5m by5jcHAgKi87IH07CiAJCTFBM0Q2MTAyMTNBN0NDMkEwMEY5NUQ0RSAvKiBQbHVnaW5Nb2R1bGVJ bmZvLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTNE NjEwMDEzQTdDQzJBMDBGOTVENEUgLyogUGx1Z2luTW9kdWxlSW5mby5oICovOyB9OworCQkxQTNE NjEwNTEzQTdGMDNBMDBGOTVENEUgLyogQXJndW1lbnRDb2RlcnMuY3BwIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEzRDYxMDQxM0E3RjAzQTAwRjk1RDRF IC8qIEFyZ3VtZW50Q29kZXJzLmNwcCAqLzsgfTsKIAkJMUEzREQxRkQxMjVFNTlGMzAwNDUxNUU2 IC8qIFdlYkZpbmRDbGllbnQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gMUEzREQxRkMxMjVFNTlGMzAwNDUxNUU2IC8qIFdlYkZpbmRDbGllbnQuY3Bw ICovOyB9OwogCQkxQTNERDIwMjEyNUU1QTFGMDA0NTE1RTYgLyogV2ViRmluZENsaWVudC5oIGlu IEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEzREQyMDExMjVF NUExRjAwNDUxNUU2IC8qIFdlYkZpbmRDbGllbnQuaCAqLzsgfTsKIAkJMUEzREQyMDYxMjVFNUEy RjAwNDUxNUU2IC8qIEFQSUNsaWVudC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gMUEzREQyMDUxMjVFNUEyRjAwNDUxNUU2IC8qIEFQSUNsaWVudC5oICov OyB9OwpAQCAtMTAxMCw2ICsxMDExLDcgQEAKIAkJMUEzMEVBQzUxMTVEN0RBMzAwNTNFOTM3IC8q IENvbm5lY3Rpb25NYWMuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0g Q29ubmVjdGlvbk1hYy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBM0Q2MEZG MTNBN0NDMkEwMEY5NUQ0RSAvKiBQbHVnaW5Nb2R1bGVJbmZvLmNwcCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFBsdWdpbk1vZHVsZUluZm8uY3BwOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQkxQTNENjEwMDEzQTdDQzJBMDBGOTVENEUgLyogUGx1Z2luTW9kdWxl SW5mby5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBQbHVnaW5Nb2R1bGVJbmZv Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTFBM0Q2MTA0MTNBN0YwM0EwMEY5NUQ0 RSAvKiBBcmd1bWVudENvZGVycy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh dGggPSBBcmd1bWVudENvZGVycy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFB M0REMUZDMTI1RTU5RjMwMDQ1MTVFNiAvKiBXZWJGaW5kQ2xpZW50LmNwcCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdlYkZpbmRDbGllbnQuY3BwOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQkxQTNERDIwMTEyNUU1QTFGMDA0NTE1RTYgLyogV2ViRmluZENsaWVu dC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJGaW5kQ2xpZW50Lmg7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBM0REMjA1MTI1RTVBMkYwMDQ1MTVFNiAvKiBB UElDbGllbnQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQVBJQ2xpZW50Lmg7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0yMjgyLDYgKzIyODQsNyBAQAogCQkJY2hp bGRyZW4gPSAoCiAJCQkJQkNDNTZGNzUxMTU5OTU1RTAwMUNDQUY5IC8qIG1hYyAqLywKIAkJCQkx QUVGRDI3ODExRDE2QzgxMDA4MjE5RDMgLyogQXJndW1lbnRDb2Rlci5oICovLAorCQkJCTFBM0Q2 MTA0MTNBN0YwM0EwMEY5NUQ0RSAvKiBBcmd1bWVudENvZGVycy5jcHAgKi8sCiAJCQkJMUFFRkQy RjYxMUQxODA3QjAwODIxOUQzIC8qIEFyZ3VtZW50Q29kZXJzLmggKi8sCiAJCQkJQkMwMzJEOUQx MEY0MzdEMTAwNThDMTVBIC8qIEFyZ3VtZW50RGVjb2Rlci5jcHAgKi8sCiAJCQkJQkMwMzJEOUUx MEY0MzdEMTAwNThDMTVBIC8qIEFyZ3VtZW50RGVjb2Rlci5oICovLApAQCAtNDQ5Myw2ICs0NDk2 LDcgQEAKIAkJCQk1MTJERjcwQTEzOEMyNkM3MDBBMjJGQzYgLyogS2V5Y2hhaW5BdHRyaWJ1dGUu Y3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJOTNDMDFEQUQxMzlBQzkxNzAwRUQ1MUQ3IC8qIENvcmVJ UENDbGllbnRSdW5Mb29wLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJMUEzRDYxMDExM0E3Q0MyQTAw Rjk1RDRFIC8qIFBsdWdpbk1vZHVsZUluZm8uY3BwIGluIFNvdXJjZXMgKi8sCisJCQkJMUEzRDYx MDUxM0E3RjAzQTAwRjk1RDRFIC8qIEFyZ3VtZW50Q29kZXJzLmNwcCBpbiBTb3VyY2VzICovLAog CQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9OwpJ bmRleDogU291cmNlL1dlYktpdDIvd2luL1dlYktpdDIudmNwcm9qCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL3dpbi9XZWJLaXQyLnZjcHJvagkocmV2aXNpb24gODg4MzgpCisrKyBTb3Vy Y2UvV2ViS2l0Mi93aW4vV2ViS2l0Mi52Y3Byb2oJKHdvcmtpbmcgY29weSkKQEAgLTM3MzgsNiAr MzczOCwxMCBAQAogCQkJCQk+CiAJCQkJPC9GaWxlPgogCQkJCTxGaWxlCisJCQkJCVJlbGF0aXZl UGF0aD0iLi5cUGxhdGZvcm1cQ29yZUlQQ1xBcmd1bWVudENvZGVycy5jcHAiCisJCQkJCT4KKwkJ CQk8L0ZpbGU+CisJCQkJPEZpbGUKIAkJCQkJUmVsYXRpdmVQYXRoPSIuLlxQbGF0Zm9ybVxDb3Jl SVBDXEFyZ3VtZW50Q29kZXJzLmgiCiAJCQkJCT4KIAkJCQk8L0ZpbGU+Cg==