22584 2008-12-01 18:58:00 -0800 Simplify WML attribute value error handling 2008-12-01 19:05:54 -0800 1 1 1 Unclassified WebKit XML 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 20393 1 zimmermann zimmermann oldest_to_newest 100936 0 zimmermann 2008-12-01 18:58:00 -0800 Simplify WML attribute value error handling by introducing helper functions in WMLElement. 100937 1 25651 zimmermann 2008-12-01 18:58:30 -0800 Created attachment 25651 Initial patch 100938 2 zimmermann 2008-12-01 19:00:44 -0800 Oops, the ChangeLog contains "WMLGoElement" changes, these are unrelated and not included in this patch. Please ignore. 100941 3 zimmermann 2008-12-01 19:05:54 -0800 Landed in r38890. 25651 2008-12-01 18:58:30 -0800 2008-12-01 19:01:14 -0800 Initial patch BetterErrorHandling.diff text/plain 13504 zimmermann SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDM4ODg4 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDYgQEAKKzIwMDgtMTIt MDEgIE5pa29sYXMgWmltbWVybWFubiAgPG5pa29sYXMuemltbWVybWFubkB0b3JjaG1vYmlsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IHR3byBuZXcgaGVscGVyIGZ1bmN0aW9ucyB0byBXTUxFbGVtZW50LCBwYXJzZVZhbHVlU3Vic3Rp dHV0aW5nVmFyaWFibGVSZWZlcmVuY2VzL3BhcnNlVmFsdWVGb3JiaWRkaW5nVmFyaWFibGVSZWZl cmVuY2VzLgorCisgICAgICAgIENvbnZlcnQgYWxsIGVsZW1lbnRzIHRvIHBhcnNlIHRoZWlyIGF0 dHJpYnV0ZSB2YWx1ZXMgdXNpbmcgdGhlc2UgbmV3IGhlbHBlciBmdW5jdGlvbnMuIFRoaXMgc2lt cGxpZmllcyB0aGUKKyAgICAgICAgYWN0dWFsIGF0dHJpYnV0ZSBwYXJzaW5nIGNvZGUgaW4gYWxs IFdNTEVsZW1lbnQgZGVyaXZlZCBjbGFzc2VzLCBhcyBtb3N0IFdNTCBhdHRyaWJ1dGUgdmFsdWVz IGVpdGhlciByZXBvcnQKKyAgICAgICAgYW4gZXJyb3IgaWYgdGhlcmUncyBhIHZhcmlhYmxlIHJl ZmVyZW5jZSB1c2VkIGluIHRoZSBhdHRyaWJ1dGUgdmFsdWUsIG9yIGlmIGl0J3MgaW52YWxpZC4K KworICAgICAgICBTcGxpdCB0aGUgV01MRXJyb3JJbnZhbGlkVmFyaWFibGVSZWZlcmVuY2UgZXJy b3Igd2hpY2ggY292ZXJlZCBib3RoICdpbnZhbGlkIHN5bnRheCcgLyAnd3JvbmcgbG9jYXRpb24n CisgICAgICAgIGluIHR3byBzZXBlcmF0ZWQgZXJyb3IgY29kZXM6IFdNTEVycm9ySW52YWxpZFZh cmlhYmxlUmVmZXJlbmNlIC8gV01MRXJyb3JJbnZhbGlkVmFyaWFibGVSZWZlcmVuY2VMb2NhdGlv bi4KKworICAgICAgICAqIHdtbC9XTUxBY2Nlc3NFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OldNTEFjY2Vzc0VsZW1lbnQ6OnBhcnNlTWFwcGVkQXR0cmlidXRlKToKKyAgICAgICAgKiB3 bWwvV01MRG9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldNTERvRWxlbWVudDo6ZGVm YXVsdEV2ZW50SGFuZGxlcik6CisgICAgICAgIChXZWJDb3JlOjpXTUxEb0VsZW1lbnQ6OnBhcnNl TWFwcGVkQXR0cmlidXRlKToKKyAgICAgICAgKiB3bWwvV01MRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpXTUxFbGVtZW50OjpwYXJzZVZhbHVlU3Vic3RpdHV0aW5nVmFyaWFibGVSZWZl cmVuY2VzKToKKyAgICAgICAgKFdlYkNvcmU6OldNTEVsZW1lbnQ6OnBhcnNlVmFsdWVGb3JiaWRk aW5nVmFyaWFibGVSZWZlcmVuY2VzKToKKyAgICAgICAgKiB3bWwvV01MRWxlbWVudC5oOgorICAg ICAgICAqIHdtbC9XTUxFcnJvckhhbmRsaW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnJlcG9y dFdNTEVycm9yKToKKyAgICAgICAgKiB3bWwvV01MRXJyb3JIYW5kbGluZy5oOgorICAgICAgICAo V2ViQ29yZTo6KToKKyAgICAgICAgKiB3bWwvV01MR29FbGVtZW50LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OldNTEdvRWxlbWVudDo6V01MR29FbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OldN TEdvRWxlbWVudDo6cGFyc2VNYXBwZWRBdHRyaWJ1dGUpOgorICAgICAgICAoV2ViQ29yZTo6V01M R29FbGVtZW50OjpleGVjdXRlVGFzayk6CisgICAgICAgIChXZWJDb3JlOjpXTUxHb0VsZW1lbnQ6 OnBhcnNlQ29udGVudFR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6V01MR29FbGVtZW50OjpoYW5k bGVQb3N0TWV0aG9kKToKKyAgICAgICAgKFdlYkNvcmU6OldNTEdvRWxlbWVudDo6aGFuZGxlR2V0 TWV0aG9kKToKKyAgICAgICAgKiB3bWwvV01MR29FbGVtZW50Lmg6CisgICAgICAgICogd21sL1dN TE9uRXZlbnRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldNTE9uRXZlbnRFbGVtZW50 OjpwYXJzZU1hcHBlZEF0dHJpYnV0ZSk6CisgICAgICAgICogd21sL1dNTFByZXZFbGVtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OldNTFByZXZFbGVtZW50OjpleGVjdXRlVGFzayk6CisgICAg ICAgICogd21sL1dNTFNldHZhckVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V01MU2V0 dmFyRWxlbWVudDo6cGFyc2VNYXBwZWRBdHRyaWJ1dGUpOgorICAgICAgICAqIHdtbC9XTUxUaW1l ckVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V01MVGltZXJFbGVtZW50OjpwYXJzZU1h cHBlZEF0dHJpYnV0ZSk6CisKIDIwMDgtMTItMDEgIE5pa29sYXMgWmltbWVybWFubiAgPG5pa29s YXMuemltbWVybWFubkB0b3JjaG1vYmlsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR2Vv cmdlLgpJbmRleDogd21sL1dNTEFjY2Vzc0VsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHdtbC9X TUxBY2Nlc3NFbGVtZW50LmNwcAkocmV2aXNpb24gMzg4MzcpCisrKyB3bWwvV01MQWNjZXNzRWxl bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyLDIwICs0MiwxNiBAQCBXTUxBY2Nlc3NFbGVt ZW50OjpXTUxBY2Nlc3NFbGVtZW50KGNvbnN0CiB2b2lkIFdNTEFjY2Vzc0VsZW1lbnQ6OnBhcnNl TWFwcGVkQXR0cmlidXRlKE1hcHBlZEF0dHJpYnV0ZSogYXR0cikKIHsKICAgICBpZiAoYXR0ci0+ bmFtZSgpID09IGRvbWFpbkF0dHIpIHsKLSAgICAgICAgY29uc3QgQXRvbWljU3RyaW5nJiB2YWx1 ZSA9IGF0dHItPnZhbHVlKCk7Ci0gICAgICAgIGlmIChjb250YWluc1ZhcmlhYmxlUmVmZXJlbmNl KHZhbHVlKSkgewotICAgICAgICAgICAgcmVwb3J0V01MRXJyb3IoZG9jdW1lbnQoKSwgV01MRXJy b3JJbnZhbGlkVmFyaWFibGVSZWZlcmVuY2UpOworICAgICAgICBTdHJpbmcgdmFsdWUgPSBwYXJz ZVZhbHVlRm9yYmlkZGluZ1ZhcmlhYmxlUmVmZXJlbmNlcyhhdHRyLT52YWx1ZSgpKTsKKyAgICAg ICAgaWYgKHZhbHVlLmlzRW1wdHkoKSkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQot CisgICAgICAgICAgICAKICAgICAgICAgaWYgKFdNTFBhZ2VTdGF0ZSogcGFnZVN0YXRlID0gd21s UGFnZVN0YXRlRm9yRG9jdW1lbnQoZG9jdW1lbnQoKSkpCiAgICAgICAgICAgICBwYWdlU3RhdGUt PnJlc3RyaWN0RGVja0FjY2Vzc1RvRG9tYWluKHZhbHVlKTsKICAgICB9IGVsc2UgaWYgKGF0dHIt Pm5hbWUoKSA9PSBwYXRoQXR0cikgewotICAgICAgICBjb25zdCBBdG9taWNTdHJpbmcmIHZhbHVl ID0gYXR0ci0+dmFsdWUoKTsKLSAgICAgICAgaWYgKGNvbnRhaW5zVmFyaWFibGVSZWZlcmVuY2Uo dmFsdWUpKSB7Ci0gICAgICAgICAgICByZXBvcnRXTUxFcnJvcihkb2N1bWVudCgpLCBXTUxFcnJv ckludmFsaWRWYXJpYWJsZVJlZmVyZW5jZSk7CisgICAgICAgIFN0cmluZyB2YWx1ZSA9IHBhcnNl VmFsdWVGb3JiaWRkaW5nVmFyaWFibGVSZWZlcmVuY2VzKGF0dHItPnZhbHVlKCkpOworICAgICAg ICBpZiAodmFsdWUuaXNFbXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9CiAK ICAgICAgICAgaWYgKFdNTFBhZ2VTdGF0ZSogcGFnZVN0YXRlID0gd21sUGFnZVN0YXRlRm9yRG9j dW1lbnQoZG9jdW1lbnQoKSkpCiAgICAgICAgICAgICBwYWdlU3RhdGUtPnJlc3RyaWN0RGVja0Fj Y2Vzc1RvUGF0aCh2YWx1ZSk7CkluZGV4OiB3bWwvV01MRG9FbGVtZW50LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSB3bWwvV01MRG9FbGVtZW50LmNwcAkocmV2aXNpb24gMzg4MzgpCisrKyB3bWwvV01MRG9F bGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzIsNyArMzIsNiBAQAogI2luY2x1ZGUgIlJl bmRlckJ1dHRvbi5oIgogI2luY2x1ZGUgIldNTENhcmRFbGVtZW50LmgiCiAjaW5jbHVkZSAiV01M RG9jdW1lbnQuaCIKLSNpbmNsdWRlICJXTUxFcnJvckhhbmRsaW5nLmgiCiAjaW5jbHVkZSAiV01M VGFza0VsZW1lbnQuaCIKICNpbmNsdWRlICJXTUxUaW1lckVsZW1lbnQuaCIKICNpbmNsdWRlICJX TUxOYW1lcy5oIgpAQCAtNzgsOSArNzcsMTAgQEAgdm9pZCBXTUxEb0VsZW1lbnQ6OmRlZmF1bHRF dmVudEhhbmRsZXIoRQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIC8vIFN0b3AgdGhl IHRpbWVyIG9mIHRoZSBjdXJyZW50IGNhcmQgaWYgaXQgaXMgYWN0aXZlCi0gICAgICAgIFdNTENh cmRFbGVtZW50KiBjYXJkID0gcGFnZVN0YXRlLT5hY3RpdmVDYXJkKCk7Ci0gICAgICAgIGlmIChj YXJkICYmIGNhcmQtPmV2ZW50VGltZXIoKSkKLSAgICAgICAgICAgIGNhcmQtPmV2ZW50VGltZXIo KS0+c3RvcCgpOworICAgICAgICBpZiAoV01MQ2FyZEVsZW1lbnQqIGNhcmQgPSBwYWdlU3RhdGUt PmFjdGl2ZUNhcmQoKSkgeworICAgICAgICAgICAgaWYgKFdNTFRpbWVyRWxlbWVudCogZXZlbnRU aW1lciA9IGNhcmQtPmV2ZW50VGltZXIoKSkKKyAgICAgICAgICAgICAgICBldmVudFRpbWVyLT5z dG9wKCk7CisgICAgICAgIH0KIAogICAgICAgICBwYWdlU3RhdGUtPnBhZ2UoKS0+Z29CYWNrKCk7 CiAgICAgfSBlbHNlIGlmIChtX3R5cGUgPT0gInJlc2V0IikgewpAQCAtOTQsMjQgKzk0LDEyIEBA IHZvaWQgV01MRG9FbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEUKIAogdm9pZCBXTUxEb0Vs ZW1lbnQ6OnBhcnNlTWFwcGVkQXR0cmlidXRlKE1hcHBlZEF0dHJpYnV0ZSogYXR0cikKIHsKLSAg ICBpZiAoYXR0ci0+bmFtZSgpID09IEhUTUxOYW1lczo6dHlwZUF0dHIpIHsKLSAgICAgICAgY29u c3QgQXRvbWljU3RyaW5nJiB2YWx1ZSA9IGF0dHItPnZhbHVlKCk7Ci0gICAgICAgIGlmIChjb250 YWluc1ZhcmlhYmxlUmVmZXJlbmNlKHZhbHVlKSkgewotICAgICAgICAgICAgcmVwb3J0V01MRXJy b3IoZG9jdW1lbnQoKSwgV01MRXJyb3JJbnZhbGlkVmFyaWFibGVSZWZlcmVuY2UpOwotICAgICAg ICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgbV90eXBlID0gdmFsdWU7Ci0gICAg fSBlbHNlIGlmIChhdHRyLT5uYW1lKCkgPT0gSFRNTE5hbWVzOjpuYW1lQXR0cikgewotICAgICAg ICBjb25zdCBBdG9taWNTdHJpbmcmIHZhbHVlID0gYXR0ci0+dmFsdWUoKTsKLSAgICAgICAgaWYg KGNvbnRhaW5zVmFyaWFibGVSZWZlcmVuY2UodmFsdWUpKSB7Ci0gICAgICAgICAgICByZXBvcnRX TUxFcnJvcihkb2N1bWVudCgpLCBXTUxFcnJvckludmFsaWRWYXJpYWJsZVJlZmVyZW5jZSk7Ci0g ICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICBtX25hbWUgPSB2YWx1ZTsK LSAgICB9IGVsc2UgaWYgKGF0dHItPm5hbWUoKSA9PSBIVE1MTmFtZXM6OmxhYmVsQXR0cikKLSAg ICAgICAgbV9sYWJlbCA9IHN1YnN0aXR1dGVWYXJpYWJsZVJlZmVyZW5jZXMoYXR0ci0+dmFsdWUo KSwgZG9jdW1lbnQoKSk7CisgICAgaWYgKGF0dHItPm5hbWUoKSA9PSBIVE1MTmFtZXM6OnR5cGVB dHRyKQorICAgICAgICBtX3R5cGUgPSBwYXJzZVZhbHVlRm9yYmlkZGluZ1ZhcmlhYmxlUmVmZXJl bmNlcyhhdHRyLT52YWx1ZSgpKTsKKyAgICBlbHNlIGlmIChhdHRyLT5uYW1lKCkgPT0gSFRNTE5h bWVzOjpuYW1lQXR0cikKKyAgICAgICAgbV9uYW1lID0gcGFyc2VWYWx1ZUZvcmJpZGRpbmdWYXJp YWJsZVJlZmVyZW5jZXMoYXR0ci0+dmFsdWUoKSk7CisgICAgZWxzZSBpZiAoYXR0ci0+bmFtZSgp ID09IEhUTUxOYW1lczo6bGFiZWxBdHRyKQorICAgICAgICBtX2xhYmVsID0gcGFyc2VWYWx1ZVN1 YnN0aXR1dGluZ1ZhcmlhYmxlUmVmZXJlbmNlcyhhdHRyLT52YWx1ZSgpKTsKICAgICBlbHNlIGlm IChhdHRyLT5uYW1lKCkgPT0gb3B0aW9uYWxBdHRyKQogICAgICAgICBtX2lzT3B0aW9uYWwgPSAo YXR0ci0+dmFsdWUoKSA9PSAidHJ1ZSIpOwogICAgIGVsc2UKSW5kZXg6IHdtbC9XTUxFbGVtZW50 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSB3bWwvV01MRWxlbWVudC5jcHAJKHJldmlzaW9uIDM4ODM3KQor Kysgd21sL1dNTEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw3ICsyNyw5IEBACiAj aW5jbHVkZSAiQ1NTUHJvcGVydHlOYW1lcy5oIgogI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgogI2lu Y2x1ZGUgIlJlbmRlck9iamVjdC5oIgorI2luY2x1ZGUgIldNTEVycm9ySGFuZGxpbmcuaCIKICNp bmNsdWRlICJXTUxOYW1lcy5oIgorI2luY2x1ZGUgIldNTFZhcmlhYmxlcy5oIgogCiB1c2luZyBz dGQ6Om1heDsKIHVzaW5nIHN0ZDo6bWluOwpAQCAtODUsNiArODcsMzAgQEAgUmVuZGVyT2JqZWN0 KiBXTUxFbGVtZW50OjpjcmVhdGVSZW5kZXJlcgogICAgIHJldHVybiBSZW5kZXJPYmplY3Q6OmNy ZWF0ZU9iamVjdCh0aGlzLCBzdHlsZSk7CiB9CiAKK1N0cmluZyBXTUxFbGVtZW50OjpwYXJzZVZh bHVlU3Vic3RpdHV0aW5nVmFyaWFibGVSZWZlcmVuY2VzKGNvbnN0IEF0b21pY1N0cmluZyYgdmFs dWUpCit7CisgICAgYm9vbCBpc1ZhbGlkID0gZmFsc2U7CisgICAgaWYgKCFjb250YWluc1Zhcmlh YmxlUmVmZXJlbmNlKHZhbHVlLCBpc1ZhbGlkKSkKKyAgICAgICAgcmV0dXJuIHZhbHVlOworCisg ICAgaWYgKCFpc1ZhbGlkKSB7CisgICAgICAgIHJlcG9ydFdNTEVycm9yKGRvY3VtZW50KCksIFdN TEVycm9ySW52YWxpZFZhcmlhYmxlUmVmZXJlbmNlKTsKKyAgICAgICAgcmV0dXJuIFN0cmluZygp OworICAgIH0KKworICAgIHJldHVybiBzdWJzdGl0dXRlVmFyaWFibGVSZWZlcmVuY2VzKHZhbHVl LCBkb2N1bWVudCgpKTsKK30KKworU3RyaW5nIFdNTEVsZW1lbnQ6OnBhcnNlVmFsdWVGb3JiaWRk aW5nVmFyaWFibGVSZWZlcmVuY2VzKGNvbnN0IEF0b21pY1N0cmluZyYgdmFsdWUpCit7CisgICAg aWYgKGNvbnRhaW5zVmFyaWFibGVSZWZlcmVuY2UodmFsdWUpKSB7CisgICAgICAgIHJlcG9ydFdN TEVycm9yKGRvY3VtZW50KCksIFdNTEVycm9ySW52YWxpZFZhcmlhYmxlUmVmZXJlbmNlTG9jYXRp b24pOworICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisgICAgfQorCisgICAgcmV0dXJuIHZhbHVl OworfQorCiB9CiAKICNlbmRpZgpJbmRleDogd21sL1dNTEVsZW1lbnQuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSB3bWwvV01MRWxlbWVudC5oCShyZXZpc2lvbiAzODgzNykKKysrIHdtbC9XTUxFbGVtZW50LmgJ KHdvcmtpbmcgY29weSkKQEAgLTQwLDYgKzQwLDExIEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwg Ym9vbCByZW5kZXJlcklzTmVlZGVkKFJlbmRlclN0eWxlKik7CiAgICAgdmlydHVhbCBSZW5kZXJP YmplY3QqIGNyZWF0ZVJlbmRlcmVyKFJlbmRlckFyZW5hKiwgUmVuZGVyU3R5bGUqKTsKKworcHJv dGVjdGVkOgorICAgIC8vIEhlbHBlciBmdW5jdGlvbiBmb3IgZGVyaXZlZCBjbGFzc2VzCisgICAg U3RyaW5nIHBhcnNlVmFsdWVTdWJzdGl0dXRpbmdWYXJpYWJsZVJlZmVyZW5jZXMoY29uc3QgQXRv bWljU3RyaW5nJik7CisgICAgU3RyaW5nIHBhcnNlVmFsdWVGb3JiaWRkaW5nVmFyaWFibGVSZWZl cmVuY2VzKGNvbnN0IEF0b21pY1N0cmluZyYpOwogfTsKIAogfQpJbmRleDogd21sL1dNTEVycm9y SGFuZGxpbmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHdtbC9XTUxFcnJvckhhbmRsaW5nLmNwcAkocmV2 aXNpb24gMzg4MzgpCisrKyB3bWwvV01MRXJyb3JIYW5kbGluZy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTY3LDcgKzY3LDEwIEBAIHZvaWQgcmVwb3J0V01MRXJyb3IoRG9jdW1lbnQqIGRvYywgV01M RXIKICAgICAgICAgZXJyb3JNZXNzYWdlID0gIkEgdmFyaWFibGUgbmFtZSBjb250YWlucyBpbnZh bGlkIGNoYXJhY3RlcnMuIjsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXTUxFcnJvckludmFs aWRWYXJpYWJsZVJlZmVyZW5jZToKLSAgICAgICAgZXJyb3JNZXNzYWdlID0gIkEgdmFyaWFibGUg cmVmZXJlbmNlIHVzZXMgaW52YWxpZCBzeW50YXggb3IgaXMgcGxhY2VkIGluIGFuIGludmFsaWQg bG9jYXRpb24uIjsKKyAgICAgICAgZXJyb3JNZXNzYWdlID0gIkEgdmFyaWFibGUgcmVmZXJlbmNl IHVzZXMgaW52YWxpZCBzeW50YXguIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBXTUxFcnJv ckludmFsaWRWYXJpYWJsZVJlZmVyZW5jZUxvY2F0aW9uOgorICAgICAgICBlcnJvck1lc3NhZ2Ug PSAiQSB2YXJpYWJsZSByZWZlcmVuY2UgaXMgcGxhY2VkIGluIGFuIGludmFsaWQgbG9jYXRpb24u IjsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXTUxFcnJvck11bHRpcGxlQWNjZXNzRWxlbWVu dHM6CiAgICAgICAgIGVycm9yTWVzc2FnZSA9ICJPbmx5IG9uZSBhY2Nlc3MgZWxlbWVudCBpcyBh bGxvd2VkIGluIGEgZGVjay4iOwpJbmRleDogd21sL1dNTEVycm9ySGFuZGxpbmcuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSB3bWwvV01MRXJyb3JIYW5kbGluZy5oCShyZXZpc2lvbiAzODgzNykKKysrIHdtbC9X TUxFcnJvckhhbmRsaW5nLmgJKHdvcmtpbmcgY29weSkKQEAgLTM2LDYgKzM2LDcgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgICAgICBXTUxFcnJvckludmFsaWRDb2x1bW5zTnVtYmVySW5UYWJs ZSwKICAgICAgICAgV01MRXJyb3JJbnZhbGlkVmFyaWFibGVOYW1lLAogICAgICAgICBXTUxFcnJv ckludmFsaWRWYXJpYWJsZVJlZmVyZW5jZSwKKyAgICAgICAgV01MRXJyb3JJbnZhbGlkVmFyaWFi bGVSZWZlcmVuY2VMb2NhdGlvbiwKICAgICAgICAgV01MRXJyb3JNdWx0aXBsZUFjY2Vzc0VsZW1l bnRzLAogICAgICAgICBXTUxFcnJvck11bHRpcGxlVGltZXJFbGVtZW50cywKICAgICAgICAgV01M RXJyb3JOb0NhcmRJbkRvY3VtZW50CkluZGV4OiB3bWwvV01MT25FdmVudEVsZW1lbnQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIHdtbC9XTUxPbkV2ZW50RWxlbWVudC5jcHAJKHJldmlzaW9uIDM4ODM3KQor Kysgd21sL1dNTE9uRXZlbnRFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQsMTkgKzQ0 LDE3IEBAIFdNTE9uRXZlbnRFbGVtZW50OjpXTUxPbkV2ZW50RWxlbWVudChjb24KIHZvaWQgV01M T25FdmVudEVsZW1lbnQ6OnBhcnNlTWFwcGVkQXR0cmlidXRlKE1hcHBlZEF0dHJpYnV0ZSogYXR0 cikKIHsKICAgICBpZiAoYXR0ci0+bmFtZSgpID09IEhUTUxOYW1lczo6dHlwZUF0dHIpIHsKLSAg ICAgICAgY29uc3QgQXRvbWljU3RyaW5nJiB2YWx1ZSA9IGF0dHItPnZhbHVlKCk7Ci0gICAgICAg IGlmIChjb250YWluc1ZhcmlhYmxlUmVmZXJlbmNlKHZhbHVlKSkgewotICAgICAgICAgICAgcmVw b3J0V01MRXJyb3IoZG9jdW1lbnQoKSwgV01MRXJyb3JJbnZhbGlkVmFyaWFibGVSZWZlcmVuY2Up OworICAgICAgICBTdHJpbmcgcGFyc2VkVmFsdWUgPSBwYXJzZVZhbHVlRm9yYmlkZGluZ1Zhcmlh YmxlUmVmZXJlbmNlcyhhdHRyLT52YWx1ZSgpKTsKKyAgICAgICAgaWYgKHBhcnNlZFZhbHVlLmlz RW1wdHkoKSkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQogCi0gICAgICAgIGlmICh2 YWx1ZSA9PSBvbmVudGVyZm9yd2FyZEF0dHIpCisgICAgICAgIGlmIChwYXJzZWRWYWx1ZSA9PSBv bmVudGVyZm9yd2FyZEF0dHIpCiAgICAgICAgICAgICBtX3R5cGUgPSBXTUxJbnRyaW5zaWNFdmVu dE9uRW50ZXJGb3J3YXJkOwotICAgICAgICBlbHNlIGlmICh2YWx1ZSA9PSBvbmVudGVyYmFja3dh cmRBdHRyKQorICAgICAgICBlbHNlIGlmIChwYXJzZWRWYWx1ZSA9PSBvbmVudGVyYmFja3dhcmRB dHRyKQogICAgICAgICAgICAgbV90eXBlID0gV01MSW50cmluc2ljRXZlbnRPbkVudGVyQmFja3dh cmQ7Ci0gICAgICAgIGVsc2UgaWYgKHZhbHVlID09IG9udGltZXJBdHRyKQorICAgICAgICBlbHNl IGlmIChwYXJzZWRWYWx1ZSA9PSBvbnRpbWVyQXR0cikKICAgICAgICAgICAgIG1fdHlwZSA9IFdN TEludHJpbnNpY0V2ZW50T25UaW1lcjsKLSAgICAgICAgZWxzZSBpZiAodmFsdWUgPT0gb25waWNr QXR0cikKKyAgICAgICAgZWxzZSBpZiAocGFyc2VkVmFsdWUgPT0gb25waWNrQXR0cikKICAgICAg ICAgICAgIG1fdHlwZSA9IFdNTEludHJpbnNpY0V2ZW50T25QaWNrOwogICAgIH0gZWxzZQogICAg ICAgICBXTUxFbGVtZW50OjpwYXJzZU1hcHBlZEF0dHJpYnV0ZShhdHRyKTsKSW5kZXg6IHdtbC9X TUxQcmV2RWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gd21sL1dNTFByZXZFbGVtZW50LmNwcAko cmV2aXNpb24gMzg4MzgpCisrKyB3bWwvV01MUHJldkVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC01NCw4ICs1NCw4IEBAIHZvaWQgV01MUHJldkVsZW1lbnQ6OmV4ZWN1dGVUYXNrKEV2ZW50 KikKICAgICBzdG9yZVZhcmlhYmxlU3RhdGUocGFnZVN0YXRlKTsKIAogICAgIC8vIFN0b3AgdGhl IHRpbWVyIG9mIHRoZSBjdXJyZW50IGNhcmQgaWYgaXQgaXMgYWN0aXZlCi0gICAgaWYgKFdNTFRp bWVyRWxlbWVudCogdGltZXIgPSBjYXJkLT5ldmVudFRpbWVyKCkpCi0gICAgICAgIHRpbWVyLT5z dG9wKCk7CisgICAgaWYgKFdNTFRpbWVyRWxlbWVudCogZXZlbnRUaW1lciA9IGNhcmQtPmV2ZW50 VGltZXIoKSkKKyAgICAgICAgZXZlbnRUaW1lci0+c3RvcCgpOwogCiAgICAgcGFnZVN0YXRlLT5w YWdlKCktPmdvQmFjaygpOwogfQpJbmRleDogd21sL1dNTFNldHZhckVsZW1lbnQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIHdtbC9XTUxTZXR2YXJFbGVtZW50LmNwcAkocmV2aXNpb24gMzg4MzcpCisrKyB3 bWwvV01MU2V0dmFyRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzLDI0ICs0MywxNyBA QCBXTUxTZXR2YXJFbGVtZW50Ojp+V01MU2V0dmFyRWxlbWVudCgpCiB2b2lkIFdNTFNldHZhckVs ZW1lbnQ6OnBhcnNlTWFwcGVkQXR0cmlidXRlKE1hcHBlZEF0dHJpYnV0ZSogYXR0cikKIHsKICAg ICBpZiAoYXR0ci0+bmFtZSgpID09IEhUTUxOYW1lczo6bmFtZUF0dHIpIHsKLSAgICAgICAgY29u c3QgQXRvbWljU3RyaW5nJiB2YWx1ZSA9IGF0dHItPnZhbHVlKCk7Ci0gICAgICAgIFN0cmluZyBu YW1lOwotCi0gICAgICAgIGJvb2wgaXNWYWxpZCA9IGlzVmFsaWRWYXJpYWJsZU5hbWUodmFsdWUs IHRydWUpOwotICAgICAgICBpZiAoaXNWYWxpZCkgewotICAgICAgICAgICAgbmFtZSA9IHN1YnN0 aXR1dGVWYXJpYWJsZVJlZmVyZW5jZXModmFsdWUsIGRvY3VtZW50KCkpOwotICAgICAgICAgICAg aXNWYWxpZCA9IGlzVmFsaWRWYXJpYWJsZU5hbWUobmFtZSwgdHJ1ZSk7CisgICAgICAgIFN0cmlu ZyBuYW1lID0gcGFyc2VWYWx1ZVN1YnN0aXR1dGluZ1ZhcmlhYmxlUmVmZXJlbmNlcyhhdHRyLT52 YWx1ZSgpKTsKKyAgICAgICAgaWYgKCFpc1ZhbGlkVmFyaWFibGVOYW1lKG5hbWUpKSB7CisgICAg ICAgICAgICByZXBvcnRXTUxFcnJvcihkb2N1bWVudCgpLCBXTUxFcnJvckludmFsaWRWYXJpYWJs ZU5hbWUpOworICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKGlz VmFsaWQpCi0gICAgICAgICAgICBtX25hbWUgPSBuYW1lOwotICAgICAgICBlbHNlCi0gICAgICAg ICAgICByZXBvcnRXTUxFcnJvcihkb2N1bWVudCgpLCBXTUxFcnJvckludmFsaWRWYXJpYWJsZU5h bWUpOworICAgICAgICBtX25hbWUgPSBuYW1lOwogICAgIH0gZWxzZSBpZiAoYXR0ci0+bmFtZSgp ID09IEhUTUxOYW1lczo6dmFsdWVBdHRyKQotICAgICAgICBtX3ZhbHVlID0gc3Vic3RpdHV0ZVZh cmlhYmxlUmVmZXJlbmNlcyhhdHRyLT52YWx1ZSgpLCBkb2N1bWVudCgpKTsKKyAgICAgICAgbV92 YWx1ZSA9IHBhcnNlVmFsdWVTdWJzdGl0dXRpbmdWYXJpYWJsZVJlZmVyZW5jZXMoYXR0ci0+dmFs dWUoKSk7CiAgICAgZWxzZQogICAgICAgICBXTUxFbGVtZW50OjpwYXJzZU1hcHBlZEF0dHJpYnV0 ZShhdHRyKTsKLQogfQogCiB2b2lkIFdNTFNldHZhckVsZW1lbnQ6Omluc2VydGVkSW50b0RvY3Vt ZW50KCkKSW5kZXg6IHdtbC9XTUxUaW1lckVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHdtbC9X TUxUaW1lckVsZW1lbnQuY3BwCShyZXZpc2lvbiAzODgzOCkKKysrIHdtbC9XTUxUaW1lckVsZW1l bnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw3ICsyNyw2IEBACiAjaW5jbHVkZSAiSFRNTE5h bWVzLmgiCiAjaW5jbHVkZSAiV01MQ2FyZEVsZW1lbnQuaCIKICNpbmNsdWRlICJXTUxEb2N1bWVu dC5oIgotI2luY2x1ZGUgIldNTEVycm9ySGFuZGxpbmcuaCIKICNpbmNsdWRlICJXTUxOYW1lcy5o IgogI2luY2x1ZGUgIldNTFBhZ2VTdGF0ZS5oIgogI2luY2x1ZGUgIldNTFZhcmlhYmxlcy5oIgpA QCAtNDQsMTYgKzQzLDEwIEBAIFdNTFRpbWVyRWxlbWVudDo6V01MVGltZXJFbGVtZW50KGNvbnN0 IFEKIAogdm9pZCBXTUxUaW1lckVsZW1lbnQ6OnBhcnNlTWFwcGVkQXR0cmlidXRlKE1hcHBlZEF0 dHJpYnV0ZSogYXR0cikKIHsKLSAgICBpZiAoYXR0ci0+bmFtZSgpID09IEhUTUxOYW1lczo6bmFt ZUF0dHIpIHsKLSAgICAgICAgY29uc3QgQXRvbWljU3RyaW5nJiB2YWx1ZSA9IGF0dHItPnZhbHVl KCk7Ci0gICAgICAgIGlmICghaXNWYWxpZFZhcmlhYmxlTmFtZSh2YWx1ZSwgdHJ1ZSkpIHsKLSAg ICAgICAgICAgIHJlcG9ydFdNTEVycm9yKGRvY3VtZW50KCksIFdNTEVycm9ySW52YWxpZFZhcmlh YmxlTmFtZSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICBtX25h bWUgPSB2YWx1ZTsKLSAgICB9IGVsc2UgaWYgKGF0dHItPm5hbWUoKSA9PSBIVE1MTmFtZXM6OnZh bHVlQXR0cikKLSAgICAgICAgbV92YWx1ZSA9IHN1YnN0aXR1dGVWYXJpYWJsZVJlZmVyZW5jZXMo YXR0ci0+dmFsdWUoKSwgZG9jdW1lbnQoKSk7CisgICAgaWYgKGF0dHItPm5hbWUoKSA9PSBIVE1M TmFtZXM6Om5hbWVBdHRyKQorICAgICAgICBtX25hbWUgPSBwYXJzZVZhbHVlRm9yYmlkZGluZ1Zh cmlhYmxlUmVmZXJlbmNlcyhhdHRyLT52YWx1ZSgpKTsKKyAgICBlbHNlIGlmIChhdHRyLT5uYW1l KCkgPT0gSFRNTE5hbWVzOjp2YWx1ZUF0dHIpCisgICAgICAgIG1fdmFsdWUgPSBwYXJzZVZhbHVl U3Vic3RpdHV0aW5nVmFyaWFibGVSZWZlcmVuY2VzKGF0dHItPnZhbHVlKCkpOwogICAgIGVsc2UK ICAgICAgICAgV01MRWxlbWVudDo6cGFyc2VNYXBwZWRBdHRyaWJ1dGUoYXR0cik7CiB9Cg==