128042 2014-02-01 08:42:14 -0800 Use deprecatedCharacters in a few more places (non-Mac-build sites found by EWS) 2014-02-01 20:54:50 -0800 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 126865 1 darin darin alecflett commit-queue ggaren jsbell oldest_to_newest 974618 0 darin 2014-02-01 08:42:14 -0800 Use deprecatedCharacters in a few more places (non-Mac-build sites found by EWS) 974619 1 222882 darin 2014-02-01 08:42:44 -0800 Created attachment 222882 Patch 974627 2 ggaren 2014-02-01 10:25:01 -0800 1>..\platform\win\BString.cpp(84): error C2039: 'deprecatedCharacters' : is not a member of 'WTF::AtomicString' C:\cygwin\home\buildbot\WebKit\WebKitBuild\Release\include\private\wtf/text/AtomicString.h(40) : see declaration of 'WTF::AtomicString' 974628 3 ggaren 2014-02-01 10:25:30 -0800 1>..\platform\graphics\win\FontCacheWin.cpp(450): error C2039: 'deprecatedCharacters' : is not a member of 'WTF::AtomicString' C:\cygwin\home\buildbot\WebKit\WebKitBuild\Release\include\private\wtf/text/AtomicString.h(40) : see declaration of 'WTF::AtomicString' 1>..\platform\graphics\win\FontCacheWin.cpp(450): error C2660: 'memcpy' : function does not take 2 arguments 1>..\platform\graphics\win\FontCacheWin.cpp(532): error C2039: 'deprecatedCharacters' : is not a member of 'WTF::AtomicString' C:\cygwin\home\buildbot\WebKit\WebKitBuild\Release\include\private\wtf/text/AtomicString.h(40) : see declaration of 'WTF::AtomicString' 1>..\platform\graphics\win\FontCacheWin.cpp(532): error C2660: 'memcpy' : function does not take 2 arguments 974665 4 222882 sam 2014-02-01 16:05:33 -0800 Comment on attachment 222882 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=222882&action=review > Source/WebCore/platform/win/BString.cpp:84 > + m_bstr = SysAllocStringLen(s.deprecatedCharacters(), s.length()); AtomicString does not have a deprecatedCharacters(), so you need to do a s.string().deprecatedCharacters(). 974701 5 darin 2014-02-01 20:54:50 -0800 Committed r163257: <http://trac.webkit.org/changeset/163257> 222882 2014-02-01 08:42:44 -0800 2014-02-01 20:51:19 -0800 Patch bug-128042-20140201084244.patch text/plain 12405 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzMjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Y4MWNlZDcyZTgxOWE5 NDQ5Njc1MThmZmU1ZDU4ZmVjOTgwYzkyMi4uM2M2M2I3YWU5MjY1OTEzM2U4NDgwMjdlNjM4MDM5 YzE1ZTM1MWQ4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTAyLTAxICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgZGVwcmVjYXRlZENoYXJh Y3RlcnMgaW4gYSBmZXcgbW9yZSBwbGFjZXMgKG5vbi1NYWMtYnVpbGQgc2l0ZXMgZm91bmQgYnkg RVdTKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4 MDQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBN b2R1bGVzL2luZGV4ZWRkYi9sZXZlbGRiL0lEQkxldmVsREJDb2RpbmcuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SURCTGV2ZWxEQkNvZGluZzo6ZW5jb2RlU3RyaW5nKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZv bnRDYWNoZTo6c3lzdGVtRmFsbGJhY2tGb3JDaGFyYWN0ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6 OmNyZWF0ZUdESUZvbnQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpnZXRUcmFpdHNJ bkZhbWlseSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9EYXRhVVJMLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmhhbmRsZURhdGFVUkwpOgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9CU3Ry aW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkJTdHJpbmc6OkJTdHJpbmcpOgorICAgICAgICAq IHBsYXRmb3JtL3dpbi9DbGlwYm9hcmRVdGlsaXRpZXNXaW4uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Y3JlYXRlR2xvYmFsRGF0YSk6CisgICAgICAgICogcGxhdGZvcm0vd2luL0ZpbGVTeXN0ZW1X aW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KToKKyAg ICAgICAgKFdlYkNvcmU6OmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbik6CisgICAgICAgICogcGxh dGZvcm0vd2luL1Bhc3RlYm9hcmRXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZmlsZXN5c3Rl bVBhdGhGcm9tVXJsT3JUaXRsZSk6CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjp3cml0 ZVVSTFRvRGF0YU9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVHbG9iYWxJbWFnZUZp bGVEZXNjcmlwdG9yKToKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vUG9wdXBNZW51V2luLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudVdpbjo6Y2FsY3VsYXRlUG9zaXRpb25BbmRTaXpl KToKKyAgICAgICAgQ2FsbCBkZXByZWNhdGVkQ2hhcmFjdGVycyBpbnN0ZWFkIG9mIGNoYXJhY3Rl cnMuCisKIDIwMTQtMDItMDEgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAog ICAgICAgICBBZGQgc2VjdXJpdHktY2hlY2tlZCBjYXN0cyBmb3IgYWxsIFdlYkNvcmU6OkNhY2hl ZFJlc291cmNlIHN1YmNsYXNzZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL2xldmVsZGIvSURCTGV2ZWxEQkNvZGluZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2luZGV4ZWRkYi9sZXZlbGRiL0lEQkxldmVsREJDb2RpbmcuY3BwCmluZGV4IGE0ZGNi MWVkZTJkMjk5MWJiNjJlOWI1MWIzZjI5M2IwNzEzMWM2YmQuLjVmM2FlMTU2YWQ5OWRkZjU3N2Q3 YzEyNjk3ZWZkNmUzMjRlMjVjMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL2xldmVsZGIvSURCTGV2ZWxEQkNvZGluZy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvbGV2ZWxkYi9JREJMZXZlbERCQ29kaW5nLmNwcApAQCAtMjk3 LDcgKzI5Nyw3IEBAIFZlY3RvcjxjaGFyPiBlbmNvZGVTdHJpbmcoY29uc3QgU3RyaW5nJiBzKQog ICAgIHNpemVfdCBsZW5ndGggPSBzLmxlbmd0aCgpOwogICAgIFZlY3RvcjxjaGFyPiByZXQobGVu Z3RoICogc2l6ZW9mKFVDaGFyKSk7CiAKLSAgICBjb25zdCBVQ2hhciogc3JjID0gcy5jaGFyYWN0 ZXJzKCk7CisgICAgY29uc3QgVUNoYXIqIHNyYyA9IHMuZGVwcmVjYXRlZENoYXJhY3RlcnMoKTsK ICAgICBVQ2hhciogZHN0ID0gcmVpbnRlcnByZXRfY2FzdDxVQ2hhcio+KHJldC5kYXRhKCkpOwog ICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkKICAgICAgICAgKmRzdCsr ID0gaHRvbnMoKnNyYysrKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvd2luL0ZvbnRDYWNoZVdpbi5jcHAKaW5kZXggNzFiZmRkOTg2NDhkMGQwNWUzNmRjMWY0 OTIzMDczMDVmYTE5OTIxYS4uNDQ5ZjUzYTcxNzhjMDU4MTBmMTVkYWI4MjQ5NWQxNzFmNzljZjVj YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRD YWNoZVdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0Zv bnRDYWNoZVdpbi5jcHAKQEAgLTI3Niw3ICsyNzYsNyBAQCBQYXNzUmVmUHRyPFNpbXBsZUZvbnRE YXRhPiBGb250Q2FjaGU6OnN5c3RlbUZhbGxiYWNrRm9yQ2hhcmFjdGVycyhjb25zdCBGb250RGVz YwogCiAgICAgICAgIExPR0ZPTlQgbG9nRm9udDsKICAgICAgICAgbG9nRm9udC5sZkNoYXJTZXQg PSBERUZBVUxUX0NIQVJTRVQ7Ci0gICAgICAgIG1lbWNweShsb2dGb250LmxmRmFjZU5hbWUsIGxp bmtlZEZvbnRzLT5hdChsaW5rZWRGb250SW5kZXgpLmNoYXJhY3RlcnMoKSwgbGlua2VkRm9udHMt PmF0KGxpbmtlZEZvbnRJbmRleCkubGVuZ3RoKCkgKiBzaXplb2YoV0NIQVIpKTsKKyAgICAgICAg bWVtY3B5KGxvZ0ZvbnQubGZGYWNlTmFtZSwgbGlua2VkRm9udHMtPmF0KGxpbmtlZEZvbnRJbmRl eCkuZGVwcmVjYXRlZENoYXJhY3RlcnMoKSwgbGlua2VkRm9udHMtPmF0KGxpbmtlZEZvbnRJbmRl eCkubGVuZ3RoKCkgKiBzaXplb2YoV0NIQVIpKTsKICAgICAgICAgbG9nRm9udC5sZkZhY2VOYW1l W2xpbmtlZEZvbnRzLT5hdChsaW5rZWRGb250SW5kZXgpLmxlbmd0aCgpXSA9IDA7CiAgICAgICAg IEVudW1Gb250RmFtaWxpZXNFeChoZGMsICZsb2dGb250LCBsaW5rZWRGb250RW51bVByb2MsIHJl aW50ZXJwcmV0X2Nhc3Q8TFBBUkFNPigmaGZvbnQpLCAwKTsKICAgICAgICAgbGlua2VkRm9udElu ZGV4Kys7CkBAIC00NDcsNyArNDQ3LDcgQEAgc3RhdGljIEdESU9iamVjdDxIRk9OVD4gY3JlYXRl R0RJRm9udChjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseSwgTE9ORyBkZXNpcmVkV2UKICAgICBM T0dGT05UIGxvZ0ZvbnQ7CiAgICAgbG9nRm9udC5sZkNoYXJTZXQgPSBERUZBVUxUX0NIQVJTRVQ7 CiAgICAgdW5zaWduZWQgZmFtaWx5TGVuZ3RoID0gbWluKGZhbWlseS5sZW5ndGgoKSwgc3RhdGlj X2Nhc3Q8dW5zaWduZWQ+KExGX0ZBQ0VTSVpFIC0gMSkpOwotICAgIG1lbWNweShsb2dGb250Lmxm RmFjZU5hbWUsIGZhbWlseS5jaGFyYWN0ZXJzKCksIGZhbWlseUxlbmd0aCAqIHNpemVvZihVQ2hh cikpOworICAgIG1lbWNweShsb2dGb250LmxmRmFjZU5hbWUsIGZhbWlseS5kZXByZWNhdGVkQ2hh cmFjdGVycygpLCBmYW1pbHlMZW5ndGggKiBzaXplb2YoVUNoYXIpKTsKICAgICBsb2dGb250Lmxm RmFjZU5hbWVbZmFtaWx5TGVuZ3RoXSA9IDA7CiAgICAgbG9nRm9udC5sZlBpdGNoQW5kRmFtaWx5 ID0gMDsKIApAQCAtNTI5LDcgKzUyOSw3IEBAIHZvaWQgRm9udENhY2hlOjpnZXRUcmFpdHNJbkZh bWlseShjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseU5hbWUsIFZlY3Rvcjx1bnNpZ25lCiAgICAg TE9HRk9OVCBsb2dGb250OwogICAgIGxvZ0ZvbnQubGZDaGFyU2V0ID0gREVGQVVMVF9DSEFSU0VU OwogICAgIHVuc2lnbmVkIGZhbWlseUxlbmd0aCA9IG1pbihmYW1pbHlOYW1lLmxlbmd0aCgpLCBz dGF0aWNfY2FzdDx1bnNpZ25lZD4oTEZfRkFDRVNJWkUgLSAxKSk7Ci0gICAgbWVtY3B5KGxvZ0Zv bnQubGZGYWNlTmFtZSwgZmFtaWx5TmFtZS5jaGFyYWN0ZXJzKCksIGZhbWlseUxlbmd0aCAqIHNp emVvZihVQ2hhcikpOworICAgIG1lbWNweShsb2dGb250LmxmRmFjZU5hbWUsIGZhbWlseU5hbWUu ZGVwcmVjYXRlZENoYXJhY3RlcnMoKSwgZmFtaWx5TGVuZ3RoICogc2l6ZW9mKFVDaGFyKSk7CiAg ICAgbG9nRm9udC5sZkZhY2VOYW1lW2ZhbWlseUxlbmd0aF0gPSAwOwogICAgIGxvZ0ZvbnQubGZQ aXRjaEFuZEZhbWlseSA9IDA7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvRGF0YVVSTC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Rh dGFVUkwuY3BwCmluZGV4IDc3NjdmZTI2NDVmMTZlZTYxMGRkMTdlNTcwYWEzOGFjMmYyNDExNzYu LmU1YjUzZmEyZmY5MGU4MTk0ZGI5NWJlNjQ2N2MwMDc1Y2E4MjYyMzEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRGF0YVVSTC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9EYXRhVVJMLmNwcApAQCAtODQsNyArODQsNyBAQCB2b2lk IGhhbmRsZURhdGFVUkwoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSkKICAgICAgICAgZGF0YSA9IGRl Y29kZVVSTEVzY2FwZVNlcXVlbmNlcyhkYXRhLCBlbmNvZGluZyk7CiAgICAgICAgIGhhbmRsZS0+ Y2xpZW50KCktPmRpZFJlY2VpdmVSZXNwb25zZShoYW5kbGUsIHJlc3BvbnNlKTsKIAotICAgICAg ICBDU3RyaW5nIGVuY29kZWREYXRhID0gZW5jb2RpbmcuZW5jb2RlKGRhdGEuY2hhcmFjdGVycygp LCBkYXRhLmxlbmd0aCgpLCBVUkxFbmNvZGVkRW50aXRpZXNGb3JVbmVuY29kYWJsZXMpOworICAg ICAgICBDU3RyaW5nIGVuY29kZWREYXRhID0gZW5jb2RpbmcuZW5jb2RlKGRhdGEuZGVwcmVjYXRl ZENoYXJhY3RlcnMoKSwgZGF0YS5sZW5ndGgoKSwgVVJMRW5jb2RlZEVudGl0aWVzRm9yVW5lbmNv ZGFibGVzKTsKICAgICAgICAgcmVzcG9uc2Uuc2V0RXhwZWN0ZWRDb250ZW50TGVuZ3RoKGVuY29k ZWREYXRhLmxlbmd0aCgpKTsKICAgICAgICAgaWYgKGVuY29kZWREYXRhLmxlbmd0aCgpKQogICAg ICAgICAgICAgaGFuZGxlLT5jbGllbnQoKS0+ZGlkUmVjZWl2ZURhdGEoaGFuZGxlLCBlbmNvZGVk RGF0YS5kYXRhKCksIGVuY29kZWREYXRhLmxlbmd0aCgpLCAwKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9CU3RyaW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3dpbi9CU3RyaW5nLmNwcAppbmRleCBhMDFjZDA0NDRhYWVlOTIyZTg0MDFkMWYwNjYzMjcz YjdiYzlmOWE4Li42NDE1YmEzZGRmMzQ0NmRhYjc2NTU3YWM5MWIzNjM2MDZmZTRlZjFlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQlN0cmluZy5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL0JTdHJpbmcuY3BwCkBAIC02NSw3ICs2NSw3IEBAIEJT dHJpbmc6OkJTdHJpbmcoY29uc3QgU3RyaW5nJiBzKQogICAgIGlmIChzLmlzTnVsbCgpKQogICAg ICAgICBtX2JzdHIgPSAwOwogICAgIGVsc2UKLSAgICAgICAgbV9ic3RyID0gU3lzQWxsb2NTdHJp bmdMZW4ocy5jaGFyYWN0ZXJzKCksIHMubGVuZ3RoKCkpOworICAgICAgICBtX2JzdHIgPSBTeXNB bGxvY1N0cmluZ0xlbihzLmRlcHJlY2F0ZWRDaGFyYWN0ZXJzKCksIHMubGVuZ3RoKCkpOwogfQog CiBCU3RyaW5nOjpCU3RyaW5nKGNvbnN0IFVSTCYgdXJsKQpAQCAtNzMsNyArNzMsNyBAQCBCU3Ry aW5nOjpCU3RyaW5nKGNvbnN0IFVSTCYgdXJsKQogICAgIGlmICh1cmwuaXNOdWxsKCkpCiAgICAg ICAgIG1fYnN0ciA9IDA7CiAgICAgZWxzZQotICAgICAgICBtX2JzdHIgPSBTeXNBbGxvY1N0cmlu Z0xlbih1cmwuc3RyaW5nKCkuY2hhcmFjdGVycygpLCB1cmwuc3RyaW5nKCkubGVuZ3RoKCkpOwor ICAgICAgICBtX2JzdHIgPSBTeXNBbGxvY1N0cmluZ0xlbih1cmwuc3RyaW5nKCkuZGVwcmVjYXRl ZENoYXJhY3RlcnMoKSwgdXJsLnN0cmluZygpLmxlbmd0aCgpKTsKIH0KIAogQlN0cmluZzo6QlN0 cmluZyhjb25zdCBBdG9taWNTdHJpbmcmIHMpCkBAIC04MSw3ICs4MSw3IEBAIEJTdHJpbmc6OkJT dHJpbmcoY29uc3QgQXRvbWljU3RyaW5nJiBzKQogICAgIGlmIChzLmlzTnVsbCgpKQogICAgICAg ICBtX2JzdHIgPSAwOwogICAgIGVsc2UKLSAgICAgICAgbV9ic3RyID0gU3lzQWxsb2NTdHJpbmdM ZW4ocy5jaGFyYWN0ZXJzKCksIHMubGVuZ3RoKCkpOworICAgICAgICBtX2JzdHIgPSBTeXNBbGxv Y1N0cmluZ0xlbihzLmRlcHJlY2F0ZWRDaGFyYWN0ZXJzKCksIHMubGVuZ3RoKCkpOwogfQogCiAj aWYgVVNFKENGKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL0NsaXBi b2FyZFV0aWxpdGllc1dpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xpcGJv YXJkVXRpbGl0aWVzV2luLmNwcAppbmRleCA5MjgxODAwMDc2OTEyZTQ1YTY1YjQwMjQwYmYyZjAw MzBmNmVmODQyLi4zMTIwMzk2NDk2MDI5NzhkOGU0ZGEwYjJlMjEwMzE2ZWMwZjg2NzAyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xpcGJvYXJkVXRpbGl0aWVzV2lu LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xpcGJvYXJkVXRpbGl0aWVz V2luLmNwcApAQCAtMTk0LDcgKzE5NCw3IEBAIEhHTE9CQUwgY3JlYXRlR2xvYmFsRGF0YShjb25z dCBTdHJpbmcmIHN0cikKICAgICBpZiAoIXZtKQogICAgICAgICByZXR1cm4gMDsKICAgICBVQ2hh ciogYnVmZmVyID0gc3RhdGljX2Nhc3Q8VUNoYXIqPihHbG9iYWxMb2NrKHZtKSk7Ci0gICAgbWVt Y3B5KGJ1ZmZlciwgc3RyLmNoYXJhY3RlcnMoKSwgc3RyLmxlbmd0aCgpICogc2l6ZW9mKFVDaGFy KSk7CisgICAgbWVtY3B5KGJ1ZmZlciwgc3RyLmRlcHJlY2F0ZWRDaGFyYWN0ZXJzKCksIHN0ci5s ZW5ndGgoKSAqIHNpemVvZihVQ2hhcikpOwogICAgIGJ1ZmZlcltzdHIubGVuZ3RoKCldID0gMDsK ICAgICBHbG9iYWxVbmxvY2sodm0pOwogICAgIHJldHVybiB2bTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9GaWxlU3lzdGVtV2luLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL3dpbi9GaWxlU3lzdGVtV2luLmNwcAppbmRleCA5NWViZDAwNjBlNGY1ZTQxZTFm N2NmZjIzOGZlZTdhZGJjYzUwZTRjLi5lODE0ZWMzNWQyYTA5OWE3YWU2Y2QyOGY1N2MyYWQ4OGZh NTM4ZWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vRmlsZVN5c3Rl bVdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL0ZpbGVTeXN0ZW1XaW4u Y3BwCkBAIC0xNTksMTkgKzE1OSwxOSBAQCBTdHJpbmcgcGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50 KGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3QgU3RyaW5nJiBjb21wb25lbnQpCiAgICAgVmVjdG9y PFVDaGFyPiBidWZmZXIoTUFYX1BBVEgpOwogCiAjaWYgT1MoV0lOQ0UpCi0gICAgYnVmZmVyLmFw cGVuZChwYXRoLmNoYXJhY3RlcnMoKSwgcGF0aC5sZW5ndGgoKSk7CisgICAgYnVmZmVyLmFwcGVu ZChwYXRoLmRlcHJlY2F0ZWRDaGFyYWN0ZXJzKCksIHBhdGgubGVuZ3RoKCkpOwogCiAgICAgVUNo YXIgbGFzdFBhdGhDaGFyYWN0ZXIgPSBwYXRoW3BhdGgubGVuZ3RoKCkgLSAxXTsKICAgICBpZiAo bGFzdFBhdGhDaGFyYWN0ZXIgIT0gTCdcXCcgJiYgbGFzdFBhdGhDaGFyYWN0ZXIgIT0gTCcvJyAm JiBjb21wb25lbnRbMF0gIT0gTCdcXCcgJiYgY29tcG9uZW50WzBdICE9IEwnLycpCiAgICAgICAg IGJ1ZmZlci5hcHBlbmQoUGxhdGZvcm1GaWxlUGF0aFNlcGFyYXRvcik7CiAKLSAgICBidWZmZXIu YXBwZW5kKGNvbXBvbmVudC5jaGFyYWN0ZXJzKCksIGNvbXBvbmVudC5sZW5ndGgoKSk7CisgICAg YnVmZmVyLmFwcGVuZChjb21wb25lbnQuZGVwcmVjYXRlZENoYXJhY3RlcnMoKSwgY29tcG9uZW50 Lmxlbmd0aCgpKTsKICAgICBidWZmZXIuc2hyaW5rVG9GaXQoKTsKICNlbHNlCiAgICAgaWYgKHBh dGgubGVuZ3RoKCkgKyAxID4gYnVmZmVyLnNpemUoKSkKICAgICAgICAgcmV0dXJuIFN0cmluZygp OwogCi0gICAgbWVtY3B5KGJ1ZmZlci5kYXRhKCksIHBhdGguY2hhcmFjdGVycygpLCBwYXRoLmxl bmd0aCgpICogc2l6ZW9mKFVDaGFyKSk7CisgICAgbWVtY3B5KGJ1ZmZlci5kYXRhKCksIHBhdGgu ZGVwcmVjYXRlZENoYXJhY3RlcnMoKSwgcGF0aC5sZW5ndGgoKSAqIHNpemVvZihVQ2hhcikpOwog ICAgIGJ1ZmZlcltwYXRoLmxlbmd0aCgpXSA9ICdcMCc7CiAKICAgICBTdHJpbmcgY29tcG9uZW50 Q29weSA9IGNvbXBvbmVudDsKQEAgLTE4OCw3ICsxODgsNyBAQCBTdHJpbmcgcGF0aEJ5QXBwZW5k aW5nQ29tcG9uZW50KGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3QgU3RyaW5nJiBjb21wb25lbnQp CiAKIENTdHJpbmcgZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGNvbnN0IFN0cmluZyYgcGF0aCkK IHsKLSAgICBjb25zdCBVQ2hhciogY2hhcmFjdGVycyA9IHBhdGguY2hhcmFjdGVycygpOworICAg IGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzID0gcGF0aC5kZXByZWNhdGVkQ2hhcmFjdGVycygpOwog ICAgIGludCBzaXplID0gV2lkZUNoYXJUb011bHRpQnl0ZShDUF9BQ1AsIDAsIGNoYXJhY3RlcnMs IHBhdGgubGVuZ3RoKCksIDAsIDAsIDAsIDApIC0gMTsKIAogICAgIGNoYXIqIGJ1ZmZlcjsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcAppbmRleCA1MmZj YzNmYzIyYzA1Y2JiNzI3ODViMmEzOGVjNTQyNTEwNzIxZDlkLi5lMzYxZTM1OTlmZjhjYWNmZDMz MTdlOTJjMTY0Mzg3OTRlZTkwOTA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS93aW4vUGFzdGVib2FyZFdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2lu L1Bhc3RlYm9hcmRXaW4uY3BwCkBAIC01NTgsNyArNTU4LDcgQEAgc3RhdGljIFN0cmluZyBmaWxl c3lzdGVtUGF0aEZyb21VcmxPclRpdGxlKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcm IHRpdGwKIAogICAgIGlmICghdGl0bGUuaXNFbXB0eSgpKSB7CiAgICAgICAgIHNpemVfdCBsZW4g PSBzdGQ6Om1pbjxzaXplX3Q+KHRpdGxlLmxlbmd0aCgpLCBmc1BhdGhNYXhMZW5ndGhFeGNsdWRp bmdFeHRlbnNpb24pOwotICAgICAgICBDb3B5TWVtb3J5KGZzUGF0aEJ1ZmZlciwgdGl0bGUuY2hh cmFjdGVycygpLCBsZW4gKiBzaXplb2YoVUNoYXIpKTsKKyAgICAgICAgQ29weU1lbW9yeShmc1Bh dGhCdWZmZXIsIHRpdGxlLmRlcHJlY2F0ZWRDaGFyYWN0ZXJzKCksIGxlbiAqIHNpemVvZihVQ2hh cikpOwogICAgICAgICBmc1BhdGhCdWZmZXJbbGVuXSA9IDA7CiAgICAgICAgIHBhdGhSZW1vdmVC YWRGU0NoYXJhY3RlcnMoZnNQYXRoQnVmZmVyLCBsZW4pOwogICAgIH0KQEAgLTU3MywxMCArNTcz LDEwIEBAIHN0YXRpYyBTdHJpbmcgZmlsZXN5c3RlbVBhdGhGcm9tVXJsT3JUaXRsZShjb25zdCBT dHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiB0aXRsCiAgICAgICAgIFN0cmluZyBsYXN0Q29tcG9u ZW50ID0ga3VybC5sYXN0UGF0aENvbXBvbmVudCgpOwogICAgICAgICBpZiAoa3VybC5pc0xvY2Fs RmlsZSgpIHx8ICghaXNMaW5rICYmICFsYXN0Q29tcG9uZW50LmlzRW1wdHkoKSkpIHsKICAgICAg ICAgICAgIGxlbiA9IHN0ZDo6bWluPERXT1JEPihmc1BhdGhNYXhMZW5ndGhFeGNsdWRpbmdFeHRl bnNpb24sIGxhc3RDb21wb25lbnQubGVuZ3RoKCkpOwotICAgICAgICAgICAgQ29weU1lbW9yeShm c1BhdGhCdWZmZXIsIGxhc3RDb21wb25lbnQuY2hhcmFjdGVycygpLCBsZW4gKiBzaXplb2YoVUNo YXIpKTsKKyAgICAgICAgICAgIENvcHlNZW1vcnkoZnNQYXRoQnVmZmVyLCBsYXN0Q29tcG9uZW50 LmRlcHJlY2F0ZWRDaGFyYWN0ZXJzKCksIGxlbiAqIHNpemVvZihVQ2hhcikpOwogICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgbGVuID0gc3RkOjptaW48RFdPUkQ+KGZzUGF0aE1heExlbmd0 aEV4Y2x1ZGluZ0V4dGVuc2lvbiwgdXJsLmxlbmd0aCgpKTsKLSAgICAgICAgICAgIENvcHlNZW1v cnkoZnNQYXRoQnVmZmVyLCB1cmwuY2hhcmFjdGVycygpLCBsZW4gKiBzaXplb2YoVUNoYXIpKTsK KyAgICAgICAgICAgIENvcHlNZW1vcnkoZnNQYXRoQnVmZmVyLCB1cmwuZGVwcmVjYXRlZENoYXJh Y3RlcnMoKSwgbGVuICogc2l6ZW9mKFVDaGFyKSk7CiAgICAgICAgIH0KICAgICAgICAgZnNQYXRo QnVmZmVyW2xlbl0gPSAwOwogICAgICAgICBwYXRoUmVtb3ZlQmFkRlNDaGFyYWN0ZXJzKGZzUGF0 aEJ1ZmZlciwgbGVuKTsKQEAgLTY3Miw3ICs2NzIsNyBAQCB2b2lkIFBhc3RlYm9hcmQ6OndyaXRl VVJMVG9EYXRhT2JqZWN0KGNvbnN0IFVSTCYga3VybCwgY29uc3QgU3RyaW5nJiB0aXRsZVN0cikK ICAgICBmZ2QtPmZnZFswXS5uRmlsZVNpemVMb3cgPSBjb250ZW50Lmxlbmd0aCgpOwogCiAgICAg dW5zaWduZWQgbWF4U2l6ZSA9IHN0ZDo6bWluPHVuc2lnbmVkPihmc1BhdGgubGVuZ3RoKCksIFdU Rl9BUlJBWV9MRU5HVEgoZmdkLT5mZ2RbMF0uY0ZpbGVOYW1lKSk7Ci0gICAgQ29weU1lbW9yeShm Z2QtPmZnZFswXS5jRmlsZU5hbWUsIGZzUGF0aC5jaGFyYWN0ZXJzKCksIG1heFNpemUgKiBzaXpl b2YoVUNoYXIpKTsKKyAgICBDb3B5TWVtb3J5KGZnZC0+ZmdkWzBdLmNGaWxlTmFtZSwgZnNQYXRo LmRlcHJlY2F0ZWRDaGFyYWN0ZXJzKCksIG1heFNpemUgKiBzaXplb2YoVUNoYXIpKTsKICAgICBH bG9iYWxVbmxvY2sodXJsRmlsZURlc2NyaXB0b3IpOwogCiAgICAgY2hhciogZmlsZUNvbnRlbnRz ID0gc3RhdGljX2Nhc3Q8Y2hhcio+KEdsb2JhbExvY2sodXJsRmlsZUNvbnRlbnQpKTsKQEAgLTkw Nyw3ICs5MDcsNyBAQCBzdGF0aWMgSEdMT0JBTCBjcmVhdGVHbG9iYWxJbWFnZUZpbGVEZXNjcmlw dG9yKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmCiAgICAgfQogCiAgICAgaW50IG1h eFNpemUgPSBzdGQ6Om1pbjxpbnQ+KGZzUGF0aC5sZW5ndGgoKSwgV1RGX0FSUkFZX0xFTkdUSChm Z2QtPmZnZFswXS5jRmlsZU5hbWUpKTsKLSAgICBDb3B5TWVtb3J5KGZnZC0+ZmdkWzBdLmNGaWxl TmFtZSwgKExQQ1dTVFIpZnNQYXRoLmNoYXJhY3RlcnMoKSwgbWF4U2l6ZSAqIHNpemVvZihVQ2hh cikpOworICAgIENvcHlNZW1vcnkoZmdkLT5mZ2RbMF0uY0ZpbGVOYW1lLCAoTFBDV1NUUilmc1Bh dGguZGVwcmVjYXRlZENoYXJhY3RlcnMoKSwgbWF4U2l6ZSAqIHNpemVvZihVQ2hhcikpOwogICAg IEdsb2JhbFVubG9jayhtZW1PYmopOwogCiAgICAgcmV0dXJuIG1lbU9iajsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9Qb3B1cE1lbnVXaW4uY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vd2luL1BvcHVwTWVudVdpbi5jcHAKaW5kZXggMjQ1NGM4OTM5NzBlYmYz ZTczZDliOGRmZmJkNjA5YmIwNDU1OGIxYS4uMGM0N2FkZmFmMDhkOWYxMGY0MDVjMDllYjdhNjQy NTUzMmU2YmIzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1BvcHVw TWVudVdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1BvcHVwTWVudVdp bi5jcHAKQEAgLTM1MSw3ICszNTEsNyBAQCB2b2lkIFBvcHVwTWVudVdpbjo6Y2FsY3VsYXRlUG9z aXRpb25BbmRTaXplKGNvbnN0IEludFJlY3QmIHIsIEZyYW1lVmlldyogdikKICAgICAgICAgICAg IGl0ZW1Gb250LnVwZGF0ZShtX3BvcHVwQ2xpZW50LT5mb250U2VsZWN0b3IoKSk7CiAgICAgICAg IH0KIAotICAgICAgICBwb3B1cFdpZHRoID0gc3RkOjptYXgocG9wdXBXaWR0aCwgc3RhdGljX2Nh c3Q8aW50PihjZWlsZihpdGVtRm9udC53aWR0aChUZXh0UnVuKHRleHQuY2hhcmFjdGVycygpLCB0 ZXh0Lmxlbmd0aCgpKSkpKSk7CisgICAgICAgIHBvcHVwV2lkdGggPSBzdGQ6Om1heChwb3B1cFdp ZHRoLCBzdGF0aWNfY2FzdDxpbnQ+KGNlaWxmKGl0ZW1Gb250LndpZHRoKFRleHRSdW4odGV4dC5k ZXByZWNhdGVkQ2hhcmFjdGVycygpLCB0ZXh0Lmxlbmd0aCgpKSkpKSk7CiAgICAgfQogCiAgICAg aWYgKG5hdHVyYWxIZWlnaHQgPiBtYXhQb3B1cEhlaWdodCkK