118159 2013-06-27 17:23:50 -0700 Get rid of the last uses of deprecatedCharactersWithNullTermination() 2013-06-27 17:34:01 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 904400 0 andersca 2013-06-27 17:23:50 -0700 Get rid of the last uses of deprecatedCharactersWithNullTermination() 904401 1 205650 andersca 2013-06-27 17:25:20 -0700 Created attachment 205650 Patch 904402 2 andersca 2013-06-27 17:34:01 -0700 Committed r152143: <http://trac.webkit.org/changeset/152143> 205650 2013-06-27 17:25:20 -0700 2013-06-27 17:29:02 -0700 Patch bug-118159-20130627172321.patch text/plain 10321 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dp bi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggZjdkYmY5ZWU3 ZmE4MjQwMTVmZjNkYTMwNDliYzI0MDQxMThkMWYwYy4uY2U3YWIzNTZiNTBiM2Q2ZmExZmY5MjEw MzkzODI3YzI4MmViMGE5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEz LTA2LTI3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAg R2V0IHJpZCBvZiB0aGUgbGFzdCB1c2VzIG9mIGRlcHJlY2F0ZWRDaGFyYWN0ZXJzV2l0aE51bGxU ZXJtaW5hdGlvbigpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTgxNTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBSZXBsYWNlIGNhbGxzIHRvIGRlcHJlY2F0ZWRDaGFyYWN0ZXJzV2l0aE51bGxUZXJtaW5h dGlvbigpIHdpdGggY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKS5kYXRhKCkuCisKKyAg ICAgICAgKiBDT01Qcm9wZXJ0eUJhZy5oOgorICAgICAgICAoOjpHZXRQcm9wZXJ0eUluZm8pOgor ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHA6CisgICAgICAgIChX ZWJDaHJvbWVDbGllbnQ6OnJ1bk9wZW5QYW5lbCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv V2ViSW5zcGVjdG9yQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYkluc3BlY3RvckZyb250ZW5kQ2xp ZW50Ojp1cGRhdGVXaW5kb3dUaXRsZSk6CisgICAgICAgICogV2ViRG93bmxvYWRDRk5ldC5jcHA6 CisgICAgICAgIChXZWJEb3dubG9hZDo6ZGlkRmluaXNoKToKKyAgICAgICAgKiBXZWJLaXRTeXN0 ZW1CaXRzLmNwcDoKKyAgICAgICAgKFdlYlZvbHVtZUZyZWVTaXplKToKKyAgICAgICAgKiBXZWJM b2NhbGl6YWJsZVN0cmluZ3MuY3BwOgorICAgICAgICAoTG9jYWxpemVkU3RyaW5nOjpvcGVyYXRv ciBMUENUU1RSKToKKyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYlZpZXc6OnNl dFRvb2xUaXApOgorCiAyMDEzLTA2LTI2ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBs ZS5jb20+CiAKICAgICAgICAgRGVwcmVjYXRlIFN0cmluZ0ltcGw6OmNoYXJhY3RlcnNXaXRoTnVs bFRlcm1pbmF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9DT01Qcm9wZXJ0eUJh Zy5oIGIvU291cmNlL1dlYktpdC93aW4vQ09NUHJvcGVydHlCYWcuaAppbmRleCA2YTcyYTk2MTFk ZDE2OGZhZjcxNmE3ZDE3NGEwYWIwOTQ0YTc2OTdmLi43NTg1NTVmMWM5Y2U1MjI1YWVjNzgyMmY1 ZDNiMTY1MDQxMzZlZmRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9DT01Qcm9wZXJ0 eUJhZy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NPTVByb3BlcnR5QmFnLmgKQEAgLTIyMiw3 ICsyMjIsNyBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIENPTVByb3BlcnR5QmFnPFZhbHVl VHlwZSwgS2V5VHlwZSwgSGFzaFR5cGU+OjpHZXRQcm9wZQogICAgICAgICBwUHJvcEJhZ1tqXS5w c3RyTmFtZSA9IChMUE9MRVNUUilDb1Rhc2tNZW1BbGxvYyhzaXplb2Yod2NoYXJfdCkqKGN1cnJl bnQtPmtleS5sZW5ndGgoKSsxKSk7CiAgICAgICAgIGlmICghcFByb3BCYWdbal0ucHN0ck5hbWUp CiAgICAgICAgICAgICByZXR1cm4gRV9PVVRPRk1FTU9SWTsKLSAgICAgICAgd2NzY3B5X3MocFBy b3BCYWdbal0ucHN0ck5hbWUsIGN1cnJlbnQtPmtleS5sZW5ndGgoKSsxLCBzdGF0aWNfY2FzdDxT dHJpbmc+KGN1cnJlbnQtPmtleSkuZGVwcmVjYXRlZENoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0 aW9uKCkpOworICAgICAgICB3Y3NjcHlfcyhwUHJvcEJhZ1tqXS5wc3RyTmFtZSwgY3VycmVudC0+ a2V5Lmxlbmd0aCgpKzEsIHN0YXRpY19jYXN0PFN0cmluZz4oY3VycmVudC0+a2V5KS5jaGFyYWN0 ZXJzV2l0aE51bGxUZXJtaW5hdGlvbigpLmRhdGEoKSk7CiAgICAgICAgICsrKnBjUHJvcGVydGll czsKICAgICB9CiAgICAgcmV0dXJuIFNfT0s7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dp bi9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdC93aW4v V2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAppbmRleCBkYTk3ODc5M2MzNDk5ZGZl NTc5NWM2NDM1NTk3ZGRmZjc3YmVhNTBlLi5jMDVlMzNiNmExNWViYjVjMTM5MzZiMmFmZDdhZGI2 N2FiZGExYzJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9X ZWJDaHJvbWVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0 L1dlYkNocm9tZUNsaWVudC5jcHAKQEAgLTY3MCwxMSArNjcwLDExIEBAIHZvaWQgV2ViQ2hyb21l Q2xpZW50OjpydW5PcGVuUGFuZWwoRnJhbWUqLCBQYXNzUmVmUHRyPEZpbGVDaG9vc2VyPiBwcnBG aWxlQ2hvb3NlCiAgICAgb2ZuLmh3bmRPd25lciA9IHZpZXdXaW5kb3c7CiAgICAgU3RyaW5nIGFs bEZpbGVzID0gYWxsRmlsZXNUZXh0KCk7CiAgICAgYWxsRmlsZXMuYXBwZW5kKEwiXDAqLipcMFww IiwgNik7Ci0gICAgb2ZuLmxwc3RyRmlsdGVyID0gYWxsRmlsZXMuZGVwcmVjYXRlZENoYXJhY3Rl cnNXaXRoTnVsbFRlcm1pbmF0aW9uKCk7CisgICAgb2ZuLmxwc3RyRmlsdGVyID0gYWxsRmlsZXMu Y2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKS5kYXRhKCk7CiAgICAgb2ZuLmxwc3RyRmls ZSA9IGZpbGVCdWYuZGF0YSgpOwogICAgIG9mbi5uTWF4RmlsZSA9IGZpbGVCdWYuc2l6ZSgpOwog ICAgIFN0cmluZyBkaWFsb2dUaXRsZSA9IHVwbG9hZEZpbGVUZXh0KCk7Ci0gICAgb2ZuLmxwc3Ry VGl0bGUgPSBkaWFsb2dUaXRsZS5kZXByZWNhdGVkQ2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRp b24oKTsKKyAgICBvZm4ubHBzdHJUaXRsZSA9IGRpYWxvZ1RpdGxlLmNoYXJhY3RlcnNXaXRoTnVs bFRlcm1pbmF0aW9uKCkuZGF0YSgpOwogICAgIG9mbi5GbGFncyA9IE9GTl9FTkFCTEVTSVpJTkcg fCBPRk5fRklMRU1VU1RFWElTVCB8IE9GTl9QQVRITVVTVEVYSVNUIHwgT0ZOX0VYUExPUkVSOwog ICAgIGlmIChtdWx0aUZpbGUpCiAgICAgICAgIG9mbi5GbGFncyA9IG9mbi5GbGFncyB8IE9GTl9B TExPV01VTFRJU0VMRUNUOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1 cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVT dXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHAKaW5kZXggNTc2MThkYTg2M2M1OWVhMjIxYzRm Y2E1N2RjODU2MjZmYmFiODE2OC4uMDQ3ZTBjNGJlOTlhNTc0YTg0ZTNlYTQ2YjM0ZTFkZWNhNzFl YzU2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViSW5z cGVjdG9yQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9X ZWJJbnNwZWN0b3JDbGllbnQuY3BwCkBAIC00NDgsNyArNDQ4LDcgQEAgdm9pZCBXZWJJbnNwZWN0 b3JGcm9udGVuZENsaWVudDo6ZGVzdHJveUluc3BlY3RvclZpZXcoYm9vbCBub3RpZnlJbnNwZWN0 b3JDb250cm8KIHZvaWQgV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OnVwZGF0ZVdpbmRvd1Rp dGxlKCkKIHsKICAgICBTdHJpbmcgdGl0bGUgPSBtYWtlU3RyaW5nKCJXZWIgSW5zcGVjdG9yICIs IHN0YXRpY19jYXN0PFVDaGFyPigweDIwMTQpLCAnICcsIG1faW5zcGVjdGVkVVJMKTsKLSAgICA6 OlNldFdpbmRvd1RleHQobV9mcm9udGVuZEh3bmQsIHRpdGxlLmRlcHJlY2F0ZWRDaGFyYWN0ZXJz V2l0aE51bGxUZXJtaW5hdGlvbigpKTsKKyAgICA6OlNldFdpbmRvd1RleHQobV9mcm9udGVuZEh3 bmQsIHRpdGxlLmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCkuZGF0YSgpKTsKIH0KIAog TFJFU1VMVCBXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6b25HZXRNaW5NYXhJbmZvKFdQQVJB TSwgTFBBUkFNIGxQYXJhbSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkRvd25s b2FkQ0ZOZXQuY3BwIGIvU291cmNlL1dlYktpdC93aW4vV2ViRG93bmxvYWRDRk5ldC5jcHAKaW5k ZXggOGRlOWVlNjk0OWJmMzg2NDI4ZWI1NGZkOTVmYWFiMzQ4YTJkNWViNS4uYWRlZTM5YTVkZjZm ZmY2ZjYzNWE0ZTJmOGEyMzhjZTViOTg5MDQ2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93 aW4vV2ViRG93bmxvYWRDRk5ldC5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViRG93bmxv YWRDRk5ldC5jcHAKQEAgLTQ3Miw3ICs0NzIsNyBAQCB2b2lkIFdlYkRvd25sb2FkOjpkaWRGaW5p c2goKQogCiAgICAgLy8gV2UgdHJ5IHRvIHJlbmFtZSB0aGUgYnVuZGxlIHRvIHRoZSBmaW5hbCBm aWxlIG5hbWUuICBJZiB0aGF0IGZhaWxzLCB3ZSBnaXZlIHRoZSBkZWxlZ2F0ZSBvbmUgbW9yZSBj aGFuY2UgdG8gY2hvc2UKICAgICAvLyB0aGUgZmluYWwgZmlsZSBuYW1lLCB0aGVuIHdlIGp1c3Qg bGVhdmUgaXQKLSAgICBpZiAoIU1vdmVGaWxlRXgobV9idW5kbGVQYXRoLmRlcHJlY2F0ZWRDaGFy YWN0ZXJzV2l0aE51bGxUZXJtaW5hdGlvbigpLCBtX2Rlc3RpbmF0aW9uLmRlcHJlY2F0ZWRDaGFy YWN0ZXJzV2l0aE51bGxUZXJtaW5hdGlvbigpLCAwKSkgeworICAgIGlmICghTW92ZUZpbGVFeCht X2J1bmRsZVBhdGguY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKS5kYXRhKCksIG1fZGVz dGluYXRpb24uY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKS5kYXRhKCksIDApKSB7CiAg ICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIG1vdmUgYnVuZGxlICVzIHRvICVzIG9uIGNvbXBs ZXRpb25cbkVycm9yIC0gJWkiLCBtX2J1bmRsZVBhdGguYXNjaWkoKS5kYXRhKCksIG1fZGVzdGlu YXRpb24uYXNjaWkoKS5kYXRhKCksIEdldExhc3RFcnJvcigpKTsKICAgICAgICAgCiAgICAgICAg IGJvb2wgcmVwb3J0QnVuZGxlUGF0aEFzRmluYWxQYXRoID0gdHJ1ZTsKQEAgLTQ4NCw3ICs0ODQs NyBAQCB2b2lkIFdlYkRvd25sb2FkOjpkaWRGaW5pc2goKQogICAgICAgICAvLyBUaGUgY2FsbCB0 byBtX2RlbGVnYXRlLT5kZWNpZGVEZXN0aW5hdGlvbldpdGhTdWdnZXN0ZWRGaWxlbmFtZSgpIHNo b3VsZCBoYXZlIGNoYW5nZWQgb3VyIGRlc3RpbmF0aW9uLCBzbyB3ZSdsbCB0cnkgdGhlIG1vdmUK ICAgICAgICAgLy8gb25lIGxhc3QgdGltZS4KICAgICAgICAgaWYgKCFtX2Rlc3RpbmF0aW9uLmlz RW1wdHkoKSkKLSAgICAgICAgICAgIGlmIChNb3ZlRmlsZUV4KG1fYnVuZGxlUGF0aC5kZXByZWNh dGVkQ2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSwgbV9kZXN0aW5hdGlvbi5kZXByZWNh dGVkQ2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSwgMCkpCisgICAgICAgICAgICBpZiAo TW92ZUZpbGVFeChtX2J1bmRsZVBhdGguY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKS5k YXRhKCksIG1fZGVzdGluYXRpb24uY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKS5kYXRh KCksIDApKQogICAgICAgICAgICAgICAgIHJlcG9ydEJ1bmRsZVBhdGhBc0ZpbmFsUGF0aCA9IGZh bHNlOwogCiAgICAgICAgIC8vIFdlIGVpdGhlciBuZWVkIHRvIHRlbGwgdGhlIGRlbGVnYXRlIG91 ciBmaW5hbCBmaWxlbmFtZSBpcyB0aGUgYnVuZGxlIGZpbGVuYW1lLCBvciBpcyB0aGUgZmlsZSBu YW1lIHRoZXkganVzdCB0b2xkIHVzIHRvIHVzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93 aW4vV2ViS2l0U3lzdGVtQml0cy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJLaXRTeXN0ZW1C aXRzLmNwcAppbmRleCAxNWMzZDVjZDYzM2Q5ZWZiNGM2ZTVmNDY0MGIwNGI4OWEzODZkOTgxLi5j ZjdmMzkzNWE1NGI3ZjlkM2RlZDRjMTI4ZjFiODg2Y2I0NDMyZTVkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L3dpbi9XZWJLaXRTeXN0ZW1CaXRzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3dp bi9XZWJLaXRTeXN0ZW1CaXRzLmNwcApAQCAtNDUsNyArNDUsNyBAQCB1bnNpZ25lZCBsb25nIGxv bmcgV2ViVm9sdW1lRnJlZVNpemUoQ0ZTdHJpbmdSZWYgY2ZzdHJpbmdQYXRoKQogewogICAgIFdU Rjo6U3RyaW5nIHBhdGgoY2ZzdHJpbmdQYXRoKTsKICAgICBVTEFSR0VfSU5URUdFUiBmcmVlQnl0 ZXNUb0NhbGxlcjsKLSAgICBCT09MIHJlc3VsdCA9IEdldERpc2tGcmVlU3BhY2VFeFcoKExQQ1dT VFIpcGF0aC5kZXByZWNhdGVkQ2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSwgJmZyZWVC eXRlc1RvQ2FsbGVyLCAwLCAwKTsKKyAgICBCT09MIHJlc3VsdCA9IEdldERpc2tGcmVlU3BhY2VF eFcoKExQQ1dTVFIpcGF0aC5jaGFyYWN0ZXJzV2l0aE51bGxUZXJtaW5hdGlvbigpLmRhdGEoKSwg JmZyZWVCeXRlc1RvQ2FsbGVyLCAwLCAwKTsKICAgICBpZiAoIXJlc3VsdCkKICAgICAgICAgcmV0 dXJuIDA7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkxvY2FsaXphYmxlU3Ry aW5ncy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJMb2NhbGl6YWJsZVN0cmluZ3MuY3BwCmlu ZGV4IDM5YWMxNDViZjNhOTY0MTBhMTJlNDJmNjAxMDQwMDA5YzAyNGU4YTIuLjQ0MmE4MDE3MmY3 NmU1ZDg5OTVhYzMwZTJkOWRmNzA4YjA0MTIzZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv d2luL1dlYkxvY2FsaXphYmxlU3RyaW5ncy5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2Vi TG9jYWxpemFibGVTdHJpbmdzLmNwcApAQCAtODgsNyArODgsNyBAQCBwcml2YXRlOgogTG9jYWxp emVkU3RyaW5nOjpvcGVyYXRvciBMUENUU1RSKCkgY29uc3QKIHsKICAgICBpZiAoIW1fc3RyaW5n LmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIG1fc3RyaW5nLmRlcHJlY2F0ZWRDaGFyYWN0ZXJz V2l0aE51bGxUZXJtaW5hdGlvbigpOworICAgICAgICByZXR1cm4gbV9zdHJpbmcuY2hhcmFjdGVy c1dpdGhOdWxsVGVybWluYXRpb24oKS5kYXRhKCk7CiAKICAgICBtX3N0cmluZyA9IG1fY2ZTdHJp bmc7CiAKQEAgLTk2LDcgKzk2LDcgQEAgTG9jYWxpemVkU3RyaW5nOjpvcGVyYXRvciBMUENUU1RS KCkgY29uc3QKICAgICAgICAgaWYgKG1fc3RyaW5nW2ldID09ICdAJyAmJiAobV9zdHJpbmdbaSAt IDFdID09ICclJyB8fCAoaSA+IDIgJiYgbV9zdHJpbmdbaSAtIDFdID09ICckJyAmJiBtX3N0cmlu Z1tpIC0gMl0gPj0gJzEnICYmIG1fc3RyaW5nW2kgLSAyXSA8PSAnOScgJiYgbV9zdHJpbmdbaSAt IDNdID09ICclJykpKQogICAgICAgICAgICAgbV9zdHJpbmcucmVwbGFjZShpLCAxLCAicyIpOwog Ci0gICAgcmV0dXJuIG1fc3RyaW5nLmRlcHJlY2F0ZWRDaGFyYWN0ZXJzV2l0aE51bGxUZXJtaW5h dGlvbigpOworICAgIHJldHVybiBtX3N0cmluZy5jaGFyYWN0ZXJzV2l0aE51bGxUZXJtaW5hdGlv bigpLmRhdGEoKTsKIH0KIAogc3RhdGljIENGQnVuZGxlUmVmIGNyZWF0ZVdlYktpdEJ1bmRsZSgp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJL aXQvd2luL1dlYlZpZXcuY3BwCmluZGV4IDJiN2MyOTM1MmZlZDIyY2UwMDE4OGEzMzE0OTIyODkz ZTU0NWY0ZTEuLmQyYTI1MWE2OGU1ZDY2NWE4NGZlNjE0Y2Y1ZjMwMzNiYTU4YWM1MjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv d2luL1dlYlZpZXcuY3BwCkBAIC0yODEyLDcgKzI4MTIsNyBAQCB2b2lkIFdlYlZpZXc6OnNldFRv b2xUaXAoY29uc3QgU3RyaW5nJiB0b29sVGlwKQogICAgICAgICBpbmZvLmNiU2l6ZSA9IHNpemVv ZihpbmZvKTsKICAgICAgICAgaW5mby51RmxhZ3MgPSBUVEZfSURJU0hXTkQ7CiAgICAgICAgIGlu Zm8udUlkID0gcmVpbnRlcnByZXRfY2FzdDxVSU5UX1BUUj4obV92aWV3V2luZG93KTsKLSAgICAg ICAgaW5mby5scHN6VGV4dCA9IGNvbnN0X2Nhc3Q8VUNoYXIqPihtX3Rvb2xUaXAuZGVwcmVjYXRl ZENoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCkpOworICAgICAgICBpbmZvLmxwc3pUZXh0 ID0gY29uc3RfY2FzdDxVQ2hhcio+KG1fdG9vbFRpcC5jaGFyYWN0ZXJzV2l0aE51bGxUZXJtaW5h dGlvbigpLmRhdGEoKSk7CiAgICAgICAgIDo6U2VuZE1lc3NhZ2UobV90b29sVGlwSHduZCwgVFRN X1VQREFURVRJUFRFWFQsIDAsIHJlaW50ZXJwcmV0X2Nhc3Q8TFBBUkFNPigmaW5mbykpOwogICAg IH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IGM3NmViODY4NDY5Njc1MTUwNjE2YTllYmY5YmY3M2Q3NDYyYjM0NjQuLjAzNWUzOWRhMWFhYzZj N2I1M2M0OGE5YzBmNThiOGEyOTFmNDVmY2YgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMy0wNi0yNyAgQW5kZXJz IENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIEdldCByaWQgb2YgdGhl IGxhc3QgdXNlcyBvZiBkZXByZWNhdGVkQ2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4MTU5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBj YWxscyB0byBkZXByZWNhdGVkQ2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSB3aXRoIGNo YXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCkuZGF0YSgpLgorCisgICAgICAgICogRHVtcFJl bmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKGZpbmRGb250RmFsbGJh Y2spOgorCiAyMDEzLTA2LTI3ICBCZW0gSm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgog CiAgICAgICAgIFN5bmMgdXAgdzNjIGltcG9ydCBzY3JpcHQgd2l0aCBjaGFuZ2VzIGluIEJsaW5r CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3Bw IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcAppbmRleCBhNmFm YzkzNTA3Y2NiZGE4NzdiNmMzZTllNjQ1ODgyOTAwYmJlMzdmLi42MmVmZTRkZGZlOWE1NDNkMGIz NzMzMmMyMTM0NWMyZmUyNzlmZDIxIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS93 aW4vRHVtcFJlbmRlclRyZWUuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9EdW1w UmVuZGVyVHJlZS5jcHAKQEAgLTk2NCw3ICs5NjQsNyBAQCBzdGF0aWMgU3RyaW5nIGZpbmRGb250 RmFsbGJhY2soY29uc3QgY2hhciogcGF0aE9yVXJsKQogICAgIFN0cmluZyBwYXRoVG9Gb250RmFs bGJhY2sgPSBXZWJDb3JlOjpkaXJlY3RvcnlOYW1lKHBhdGhPclVybCk7CiAKICAgICB3Y2hhcl90 IGZ1bGxQYXRoW19NQVhfUEFUSF07Ci0gICAgaWYgKCFfd2Z1bGxwYXRoKGZ1bGxQYXRoLCBwYXRo VG9Gb250RmFsbGJhY2suZGVwcmVjYXRlZENoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCks IF9NQVhfUEFUSCkpCisgICAgaWYgKCFfd2Z1bGxwYXRoKGZ1bGxQYXRoLCBwYXRoVG9Gb250RmFs bGJhY2suY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKS5kYXRhKCksIF9NQVhfUEFUSCkp CiAgICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOwogCiAgICAgaWYgKCE6OlBhdGhJc0RpcmVj dG9yeVcoZnVsbFBhdGgpKQpAQCAtOTk1LDcgKzk5NSw3IEBAIHN0YXRpYyBTdHJpbmcgZmluZEZv bnRGYWxsYmFjayhjb25zdCBjaGFyKiBwYXRoT3JVcmwpCiAgICAgZm9yIChWZWN0b3I8U3RyaW5n Pjo6aXRlcmF0b3IgcG9zID0gcG9zc2libGVQYXRocy5iZWdpbigpOyBwb3MgIT0gcG9zc2libGVQ YXRocy5lbmQoKTsgKytwb3MpIHsKICAgICAgICAgcGF0aFRvRm9udEZhbGxiYWNrID0gV2ViQ29y ZTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KCpwb3MsICJyZXNvdXJjZXNcXCIpOyAKIAotICAg ICAgICBpZiAoOjpQYXRoSXNEaXJlY3RvcnlXKHBhdGhUb0ZvbnRGYWxsYmFjay5kZXByZWNhdGVk Q2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSkpCisgICAgICAgIGlmICg6OlBhdGhJc0Rp cmVjdG9yeVcocGF0aFRvRm9udEZhbGxiYWNrLmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9u KCkuZGF0YSgpKSkKICAgICAgICAgICAgIHJldHVybiBwYXRoVG9Gb250RmFsbGJhY2s7CiAgICAg fQogCg==