137531 2014-10-08 12:12:01 -0700 [Win] Resolve various static analyzer warnings in WebKit 2014-10-08 12:34:06 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham oldest_to_newest 1040372 0 bfulgham 2014-10-08 12:12:01 -0700 This patch corrects a number of issues found by the MSVC static analyzer. 1040374 1 239484 bfulgham 2014-10-08 12:17:46 -0700 Created attachment 239484 Patch 1040377 2 239485 bfulgham 2014-10-08 12:19:45 -0700 Created attachment 239485 Patch 1040385 3 bfulgham 2014-10-08 12:34:06 -0700 Committed r174470: <http://trac.webkit.org/changeset/174470> 239484 2014-10-08 12:17:46 -0700 2014-10-08 12:19:43 -0700 Patch bug-137531-20141008122034.patch text/plain 7141 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NDQ2NikKKysrIFNvdXJjZS9XZWJLaXQv d2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE0LTEwLTA4 ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIFJl c29sdmUgdmFyaW91cyBzdGF0aWMgYW5hbHl6ZXIgd2FybmluZ3MgaW4gV2ViS2l0LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM3NTMxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNYXJzaGFsbGluZ0hl bHBlcnMuY3BwOgorICAgICAgICAoTWFyc2hhbGxpbmdIZWxwZXJzOjpzYWZlQXJyYXlUb0ludEFy cmF5KTogSGFuZGxlIHBvc3NpYmxlIGZhaWx1cmUgb2YKKyAgICAgICAgU2FmZUFycmF5R2V0RWxl bWVudCBjYWxsLgorICAgICAgICAoTWFyc2hhbGxpbmdIZWxwZXJzOjpzYWZlQXJyYXlUb0lVbmtu b3duQXJyYXkpOiBEaXR0by4KKyAgICAgICAgKiBNZW1vcnlTdHJlYW0uY3BwOgorICAgICAgICAo TWVtb3J5U3RyZWFtOjpDb3B5VG8pOiBaZXJvLWluaXRpYWxpemUgJ3dyaXR0ZW4nIHRvIHNpbGVu Y2Ugd2FybmluZy4gCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNw cDoKKyAgICAgICAgKFdlYkNocm9tZUNsaWVudDo6ZXhjZWVkZWREYXRhYmFzZVF1b3RhKTogSGFu ZGxlIHBvc3NpYmxlIGZhaWx1cmUgb2YKKyAgICAgICAgR2V0TW9kdWxlRmlsZU5hbWUuCisgICAg ICAgICogV2ViSGlzdG9yeS5jcHA6CisgICAgICAgIChnZXREYXlCb3VuZGFyaWVzKTogSGFuZGxl IHBvc3NpYmxlIGZhaWx1cmUgb2YgVHpTcGVjaWZpY0xvY2FsVGltZVRvU3lzdGVtVGltZQorICAg ICAgICAqIFdlYlZpZXcuY3BwOgorICAgICAgICAoV2ViVmlldzo6c2hvdWxkSW5pdGlhbGl6ZVRy YWNrUG9pbnRIYWNrKTogWmVybyBpbml0aWFsaXplIHJldHVybiB2YWx1ZS4KKyAgICAgICAgKFdl YlZpZXc6OmRpc3BhdGNoRGlkUmVjZWl2ZUljb25Gcm9tV2ViRnJhbWUpOiBEaXR0by4KKyAgICAg ICAgKFdlYlZpZXc6OnN0YW5kYXJkVXNlckFnZW50V2l0aEFwcGxpY2F0aW9uTmFtZSk6IEF2b2lk IHBvc3NpYmxlIERlbGV0ZU9iamVjdAorICAgICAgICBjYWxsIG9uIGEgbnVsbCBiaXRtYXAgaGFu ZGxlLgorCiAyMDE0LTEwLTAyICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29t PgogCiAgICAgICAgIE1vdmUgUGFnZU92ZXJsYXlbQ29udHJvbGxlcl0gdG8gV2ViQ29yZQpJbmRl eDogU291cmNlL1dlYktpdC93aW4vTWFyc2hhbGxpbmdIZWxwZXJzLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L3dpbi9NYXJzaGFsbGluZ0hlbHBlcnMuY3BwCShyZXZpc2lvbiAxNzQ0 NjUpCisrKyBTb3VyY2UvV2ViS2l0L3dpbi9NYXJzaGFsbGluZ0hlbHBlcnMuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yMzcsOSArMjM3LDkgQEAgQ0ZBcnJheVJlZiBNYXJzaGFsbGluZ0hlbHBlcnM6 OnNhZmVBcnJheQogICAgIGlmIChsZW4gPiAwKSB7CiAgICAgICAgIGl0ZW1zID0gbmV3IENGTnVt YmVyUmVmW2xlbl07CiAgICAgICAgIGZvciAoOyBsQm91bmQgPD0gdUJvdW5kOyBsQm91bmQrKykg ewotICAgICAgICAgICAgaW50IG51bTsKKyAgICAgICAgICAgIGludCBudW0gPSAwOwogICAgICAg ICAgICAgaHIgPSA6OlNhZmVBcnJheUdldEVsZW1lbnQoaW5BcnJheSwgJmxCb3VuZCwgJm51bSk7 Ci0gICAgICAgICAgICBpdGVtc1tsQm91bmRdID0gaW50VG9DRk51bWJlclJlZihudW0pOworICAg ICAgICAgICAgaXRlbXNbbEJvdW5kXSA9IFNVQ0NFRURFRChocikgPyBpbnRUb0NGTnVtYmVyUmVm KG51bSkgOiBrQ0ZOdW1iZXJOYU47CiAgICAgICAgIH0KICAgICB9CiAgICAgQ0ZBcnJheVJlZiBy ZXN1bHQgPSBDRkFycmF5Q3JlYXRlKDAsIChjb25zdCB2b2lkKiopIGl0ZW1zLCBsZW4sICZrQ0ZU eXBlQXJyYXlDYWxsQmFja3MpOwpAQCAtMjU1LDkgKzI1NSw5IEBAIENGQXJyYXlSZWYgTWFyc2hh bGxpbmdIZWxwZXJzOjpzYWZlQXJyYXkKICAgICBpZiAoU1VDQ0VFREVEKGhyKSkKICAgICAgICAg aHIgPSA6OlNhZmVBcnJheUdldFVCb3VuZChpbkFycmF5LCAxLCAmdUJvdW5kKTsKICAgICBsb25n IGxlbiA9IChTVUNDRUVERUQoaHIpKSA/ICh1Qm91bmQtbEJvdW5kKzEpIDogMDsKLSAgICB2b2lk KiBpdGVtczsKKyAgICB2b2lkKiBpdGVtcyA9IG51bGxwdHI7CiAgICAgaHIgPSA6OlNhZmVBcnJh eUFjY2Vzc0RhdGEoaW5BcnJheSwgJml0ZW1zKTsKLSAgICBDRkFycmF5UmVmIHJlc3VsdCA9IENG QXJyYXlDcmVhdGUoMCwgKGNvbnN0IHZvaWQqKikgaXRlbXMsIGxlbiwgJmtJVW5rbm93bkFycmF5 Q2FsbEJhY2tzKTsKKyAgICBDRkFycmF5UmVmIHJlc3VsdCA9IFNVQ0NFRURFRChocikgPyBDRkFy cmF5Q3JlYXRlKDAsIChjb25zdCB2b2lkKiopIGl0ZW1zLCBsZW4sICZrSVVua25vd25BcnJheUNh bGxCYWNrcykgOiBudWxscHRyOwogICAgIGhyID0gOjpTYWZlQXJyYXlVbmFjY2Vzc0RhdGEoaW5B cnJheSk7CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL01l bW9yeVN0cmVhbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC93aW4vTWVtb3J5U3Ry ZWFtLmNwcAkocmV2aXNpb24gMTc0NDY1KQorKysgU291cmNlL1dlYktpdC93aW4vTWVtb3J5U3Ry ZWFtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTkyLDcgKzE5Miw3IEBAIEhSRVNVTFQgU1RETUVU SE9EQ0FMTFRZUEUgTWVtb3J5U3RyZWFtOjoKICAgICAgICAgY2IuTG93UGFydCA9IChEV09SRCkt MTsKICAgICB9CiAKLSAgICBVTE9ORyB3cml0dGVuOworICAgIFVMT05HIHdyaXR0ZW4gPSAwOwog ICAgIFVMT05HIHJlYWQgPSBtaW4oY2IuTG93UGFydCwgKFVMT05HKShtX2J1ZmZlci0+c2l6ZSgp LW1fcG9zKSk7CiAgICAgSFJFU1VMVCBociA9IHBzdG0tPldyaXRlKG1fYnVmZmVyLT5kYXRhKCkr bV9wb3MsIHJlYWQsICZ3cml0dGVuKTsKICAgICBpZiAocGNiV3JpdHRlbikgewpJbmRleDogU291 cmNlL1dlYktpdC93aW4vV2ViSGlzdG9yeS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC93aW4vV2ViSGlzdG9yeS5jcHAJKHJldmlzaW9uIDE3NDQ2NSkKKysrIFNvdXJjZS9XZWJLaXQv d2luL1dlYkhpc3RvcnkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjYsMTIgKzEyNiwxMiBAQCBz dGF0aWMgdm9pZCBnZXREYXlCb3VuZGFyaWVzKERBVEUgZGF5LCBECiAgICAgYWRkRGF5VG9TeXN0 ZW1UaW1lKGJlZ2lubmluZ09mTmV4dERheUxvY2FsVGltZSk7CiAKICAgICBTWVNURU1USU1FIGJl Z2lubmluZ1N5c3RlbVRpbWU7Ci0gICAgOjpUelNwZWNpZmljTG9jYWxUaW1lVG9TeXN0ZW1UaW1l KDAsICZiZWdpbm5pbmdMb2NhbFRpbWUsICZiZWdpbm5pbmdTeXN0ZW1UaW1lKTsKLSAgICA6OlN5 c3RlbVRpbWVUb1ZhcmlhbnRUaW1lKCZiZWdpbm5pbmdTeXN0ZW1UaW1lLCAmYmVnaW5uaW5nT2ZE YXkpOworICAgIGlmICg6OlR6U3BlY2lmaWNMb2NhbFRpbWVUb1N5c3RlbVRpbWUoMCwgJmJlZ2lu bmluZ0xvY2FsVGltZSwgJmJlZ2lubmluZ1N5c3RlbVRpbWUpKQorICAgICAgICA6OlN5c3RlbVRp bWVUb1ZhcmlhbnRUaW1lKCZiZWdpbm5pbmdTeXN0ZW1UaW1lLCAmYmVnaW5uaW5nT2ZEYXkpOwog CiAgICAgU1lTVEVNVElNRSBiZWdpbm5pbmdPZk5leHREYXlTeXN0ZW1UaW1lOwotICAgIDo6VHpT cGVjaWZpY0xvY2FsVGltZVRvU3lzdGVtVGltZSgwLCAmYmVnaW5uaW5nT2ZOZXh0RGF5TG9jYWxU aW1lLCAmYmVnaW5uaW5nT2ZOZXh0RGF5U3lzdGVtVGltZSk7Ci0gICAgOjpTeXN0ZW1UaW1lVG9W YXJpYW50VGltZSgmYmVnaW5uaW5nT2ZOZXh0RGF5U3lzdGVtVGltZSwgJmJlZ2lubmluZ09mTmV4 dERheSk7CisgICAgaWYgKDo6VHpTcGVjaWZpY0xvY2FsVGltZVRvU3lzdGVtVGltZSgwLCAmYmVn aW5uaW5nT2ZOZXh0RGF5TG9jYWxUaW1lLCAmYmVnaW5uaW5nT2ZOZXh0RGF5U3lzdGVtVGltZSkp CisgICAgICAgIDo6U3lzdGVtVGltZVRvVmFyaWFudFRpbWUoJmJlZ2lubmluZ09mTmV4dERheVN5 c3RlbVRpbWUsICZiZWdpbm5pbmdPZk5leHREYXkpOwogfQogCiBzdGF0aWMgaW5saW5lIERBVEUg YmVnaW5uaW5nT2ZEYXkoREFURSBkYXRlKQpJbmRleDogU291cmNlL1dlYktpdC93aW4vV2ViVmll dy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAJKHJldmlz aW9uIDE3NDQ2NSkKKysrIFNvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yNjkyLDggKzI2OTIsOCBAQCBib29sIFdlYlZpZXc6OnNob3VsZEluaXRpYWxpemVU cmFja1BvaW50CiAgICAgICAgIEwiU29mdHdhcmVcXFN5bmFwdGljc1xcU3luVFBFbmhcXFVsdHJh TmF2UFMyIiB9OwogCiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCA1OyArK2kpIHsKLSAgICAgICAg SEtFWSB0cmFja1BvaW50S2V5OwotICAgICAgICBpbnQgcmVhZEtleVJlc3VsdCA9IDo6UmVnT3Bl bktleUV4VyhIS0VZX0NVUlJFTlRfVVNFUiwgdHJhY2tQb2ludEtleXNbaV0sIDAsIEtFWV9SRUFE LCAmdHJhY2tQb2ludEtleSk7CisgICAgICAgIEhLRVkgdHJhY2tQb2ludEtleSA9IG51bGxwdHI7 CisgICAgICAgIExTVEFUVVMgcmVhZEtleVJlc3VsdCA9IDo6UmVnT3BlbktleUV4VyhIS0VZX0NV UlJFTlRfVVNFUiwgdHJhY2tQb2ludEtleXNbaV0sIDAsIEtFWV9SRUFELCAmdHJhY2tQb2ludEtl eSk7CiAgICAgICAgIDo6UmVnQ2xvc2VLZXkodHJhY2tQb2ludEtleSk7CiAgICAgICAgIGlmIChy ZWFkS2V5UmVzdWx0ID09IEVSUk9SX1NVQ0NFU1MpIHsKICAgICAgICAgICAgIHNob3VsZENyZWF0 ZVNjcm9sbGJhcnMgPSB0cnVlOwpAQCAtMjkyOCw3ICsyOTI4LDcgQEAgdm9pZCBXZWJWaWV3Ojpk aXNwYXRjaERpZFJlY2VpdmVJY29uRnJvbQogCiAgICAgICAgIEJpdG1hcEluZm8gYm1JbmZvID0g Qml0bWFwSW5mbzo6Y3JlYXRlKHN6KTsKIAotICAgICAgICBIQklUTUFQIGhCaXRtYXAgPSAwOwor ICAgICAgICBIQklUTUFQIGhCaXRtYXAgPSBudWxscHRyOwogCiAgICAgICAgIEltYWdlKiBpY29u ID0gaWNvbkRhdGFiYXNlKCkuc3luY2hyb25vdXNJY29uRm9yUGFnZVVSTChzdHIsIHN6KTsKIApA QCAtMjkzOSw3ICsyOTM5LDcgQEAgdm9pZCBXZWJWaWV3OjpkaXNwYXRjaERpZFJlY2VpdmVJY29u RnJvbQogICAgICAgICB9CiAKICAgICAgICAgSFJFU1VMVCBociA9IG1fZnJhbWVMb2FkRGVsZWdh dGUtPmRpZFJlY2VpdmVJY29uKHRoaXMsIGhCaXRtYXAsIGZyYW1lKTsKLSAgICAgICAgaWYgKGhy ID09IEVfTk9USU1QTCkKKyAgICAgICAgaWYgKChociA9PSBFX05PVElNUEwpICYmIGhCaXRtYXAp CiAgICAgICAgICAgICBEZWxldGVPYmplY3QoaEJpdG1hcCk7CiAgICAgfQogfQpAQCAtNTMzMCwx NyArNTMzMCwxMyBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYlZpZXc6OmNhbkhhCiAg ICAgcmV0dXJuIFNfT0s7CiB9CiAKLUhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgV2ViVmlldzo6 c3RhbmRhcmRVc2VyQWdlbnRXaXRoQXBwbGljYXRpb25OYW1lKCAKLSAgICBCU1RSIGFwcGxpY2F0 aW9uTmFtZSwKLSAgICBCU1RSKiBncm91cE5hbWUpCitIUkVTVUxUIFdlYlZpZXc6OnN0YW5kYXJk VXNlckFnZW50V2l0aEFwcGxpY2F0aW9uTmFtZShCU1RSIGFwcGxpY2F0aW9uTmFtZSwgQlNUUiog Z3JvdXBOYW1lKQogewogICAgIGlmICghZ3JvdXBOYW1lKSB7CiAgICAgICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOwogICAgICAgICByZXR1cm4gRV9QT0lOVEVSOwogICAgIH0KIAotICAgICpncm91 cE5hbWU7Ci0KICAgICBpZiAoIWFwcGxpY2F0aW9uTmFtZSkgewogICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuIEVfUE9JTlRFUjsKSW5kZXg6IFNvdXJjZS9XZWJL aXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAkocmV2 aXNpb24gMTc0NDY1KQorKysgU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViQ2hy b21lQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTk4LDggKzU5OCw5IEBAIHZvaWQgV2Vi Q2hyb21lQ2xpZW50OjpleGNlZWRlZERhdGFiYXNlUXUKICAgICAgICAgICAgIEhNT0RVTEUgc2Fm YXJpSGFuZGxlID0gR2V0TW9kdWxlSGFuZGxlVyhMIlNhZmFyaS5leGUiKTsKICAgICAgICAgICAg IGlmICghc2FmYXJpSGFuZGxlKQogICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAg IEdldE1vZHVsZUZpbGVOYW1lKHNhZmFyaUhhbmRsZSwgcGF0aCwgV1RGX0FSUkFZX0xFTkdUSChw YXRoKSk7Ci0gICAgICAgICAgICBEV09SRCBoYW5kbGU7CisgICAgICAgICAgICBpZiAoITo6R2V0 TW9kdWxlRmlsZU5hbWUoc2FmYXJpSGFuZGxlLCBwYXRoLCBXVEZfQVJSQVlfTEVOR1RIKHBhdGgp KSkKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICBEV09SRCBoYW5kbGUgPSAw OwogICAgICAgICAgICAgRFdPUkQgdmVyc2lvblNpemUgPSBHZXRGaWxlVmVyc2lvbkluZm9TaXpl KHBhdGgsICZoYW5kbGUpOwogICAgICAgICAgICAgaWYgKCF2ZXJzaW9uU2l6ZSkKICAgICAgICAg ICAgICAgICByZXR1cm47Cg== 239485 2014-10-08 12:19:45 -0700 2014-10-08 12:21:56 -0700 Patch bug-137531-20141008122232.patch text/plain 7184 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NDQ2NikKKysrIFNvdXJjZS9XZWJLaXQv d2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE0LTEwLTA4 ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIFJl c29sdmUgdmFyaW91cyBzdGF0aWMgYW5hbHl6ZXIgd2FybmluZ3MgaW4gV2ViS2l0LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM3NTMxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNYXJzaGFsbGluZ0hl bHBlcnMuY3BwOgorICAgICAgICAoTWFyc2hhbGxpbmdIZWxwZXJzOjpzYWZlQXJyYXlUb0ludEFy cmF5KTogSGFuZGxlIHBvc3NpYmxlIGZhaWx1cmUgb2YKKyAgICAgICAgU2FmZUFycmF5R2V0RWxl bWVudCBjYWxsLgorICAgICAgICAoTWFyc2hhbGxpbmdIZWxwZXJzOjpzYWZlQXJyYXlUb0lVbmtu b3duQXJyYXkpOiBEaXR0by4KKyAgICAgICAgKiBNZW1vcnlTdHJlYW0uY3BwOgorICAgICAgICAo TWVtb3J5U3RyZWFtOjpDb3B5VG8pOiBaZXJvLWluaXRpYWxpemUgJ3dyaXR0ZW4nIHRvIHNpbGVu Y2Ugd2FybmluZy4gCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNw cDoKKyAgICAgICAgKFdlYkNocm9tZUNsaWVudDo6ZXhjZWVkZWREYXRhYmFzZVF1b3RhKTogSGFu ZGxlIHBvc3NpYmxlIGZhaWx1cmUgb2YKKyAgICAgICAgR2V0TW9kdWxlRmlsZU5hbWUuCisgICAg ICAgICogV2ViSGlzdG9yeS5jcHA6CisgICAgICAgIChnZXREYXlCb3VuZGFyaWVzKTogSGFuZGxl IHBvc3NpYmxlIGZhaWx1cmUgb2YgVHpTcGVjaWZpY0xvY2FsVGltZVRvU3lzdGVtVGltZQorICAg ICAgICAqIFdlYlZpZXcuY3BwOgorICAgICAgICAoV2ViVmlldzo6c2hvdWxkSW5pdGlhbGl6ZVRy YWNrUG9pbnRIYWNrKTogWmVybyBpbml0aWFsaXplIHJldHVybiB2YWx1ZS4KKyAgICAgICAgKFdl YlZpZXc6OmRpc3BhdGNoRGlkUmVjZWl2ZUljb25Gcm9tV2ViRnJhbWUpOiBBdm9pZCBwb3NzaWJs ZSBEZWxldGVPYmplY3QKKyAgICAgICAgY2FsbCBvbiBhIG51bGwgYml0bWFwIGhhbmRsZS4KKyAg ICAgICAgKFdlYlZpZXc6OnN0YW5kYXJkVXNlckFnZW50V2l0aEFwcGxpY2F0aW9uTmFtZSk6IEdl dCByaWQgb2Ygc3B1cmlvdXMKKyAgICAgICAgcG9pbnRlciBkZXJlZmVyZW5jZS4KKwogMjAxNC0x MC0wMiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBN b3ZlIFBhZ2VPdmVybGF5W0NvbnRyb2xsZXJdIHRvIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJL aXQvd2luL01hcnNoYWxsaW5nSGVscGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC93aW4vTWFyc2hhbGxpbmdIZWxwZXJzLmNwcAkocmV2aXNpb24gMTc0NDY1KQorKysgU291cmNl L1dlYktpdC93aW4vTWFyc2hhbGxpbmdIZWxwZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjM3 LDkgKzIzNyw5IEBAIENGQXJyYXlSZWYgTWFyc2hhbGxpbmdIZWxwZXJzOjpzYWZlQXJyYXkKICAg ICBpZiAobGVuID4gMCkgewogICAgICAgICBpdGVtcyA9IG5ldyBDRk51bWJlclJlZltsZW5dOwog ICAgICAgICBmb3IgKDsgbEJvdW5kIDw9IHVCb3VuZDsgbEJvdW5kKyspIHsKLSAgICAgICAgICAg IGludCBudW07CisgICAgICAgICAgICBpbnQgbnVtID0gMDsKICAgICAgICAgICAgIGhyID0gOjpT YWZlQXJyYXlHZXRFbGVtZW50KGluQXJyYXksICZsQm91bmQsICZudW0pOwotICAgICAgICAgICAg aXRlbXNbbEJvdW5kXSA9IGludFRvQ0ZOdW1iZXJSZWYobnVtKTsKKyAgICAgICAgICAgIGl0ZW1z W2xCb3VuZF0gPSBTVUNDRUVERUQoaHIpID8gaW50VG9DRk51bWJlclJlZihudW0pIDoga0NGTnVt YmVyTmFOOwogICAgICAgICB9CiAgICAgfQogICAgIENGQXJyYXlSZWYgcmVzdWx0ID0gQ0ZBcnJh eUNyZWF0ZSgwLCAoY29uc3Qgdm9pZCoqKSBpdGVtcywgbGVuLCAma0NGVHlwZUFycmF5Q2FsbEJh Y2tzKTsKQEAgLTI1NSw5ICsyNTUsOSBAQCBDRkFycmF5UmVmIE1hcnNoYWxsaW5nSGVscGVyczo6 c2FmZUFycmF5CiAgICAgaWYgKFNVQ0NFRURFRChocikpCiAgICAgICAgIGhyID0gOjpTYWZlQXJy YXlHZXRVQm91bmQoaW5BcnJheSwgMSwgJnVCb3VuZCk7CiAgICAgbG9uZyBsZW4gPSAoU1VDQ0VF REVEKGhyKSkgPyAodUJvdW5kLWxCb3VuZCsxKSA6IDA7Ci0gICAgdm9pZCogaXRlbXM7CisgICAg dm9pZCogaXRlbXMgPSBudWxscHRyOwogICAgIGhyID0gOjpTYWZlQXJyYXlBY2Nlc3NEYXRhKGlu QXJyYXksICZpdGVtcyk7Ci0gICAgQ0ZBcnJheVJlZiByZXN1bHQgPSBDRkFycmF5Q3JlYXRlKDAs IChjb25zdCB2b2lkKiopIGl0ZW1zLCBsZW4sICZrSVVua25vd25BcnJheUNhbGxCYWNrcyk7Cisg ICAgQ0ZBcnJheVJlZiByZXN1bHQgPSBTVUNDRUVERUQoaHIpID8gQ0ZBcnJheUNyZWF0ZSgwLCAo Y29uc3Qgdm9pZCoqKSBpdGVtcywgbGVuLCAma0lVbmtub3duQXJyYXlDYWxsQmFja3MpIDogbnVs bHB0cjsKICAgICBociA9IDo6U2FmZUFycmF5VW5hY2Nlc3NEYXRhKGluQXJyYXkpOwogICAgIHJl dHVybiByZXN1bHQ7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L3dpbi9NZW1vcnlTdHJlYW0uY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2luL01lbW9yeVN0cmVhbS5jcHAJKHJldmlz aW9uIDE3NDQ2NSkKKysrIFNvdXJjZS9XZWJLaXQvd2luL01lbW9yeVN0cmVhbS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTE5Miw3ICsxOTIsNyBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIE1l bW9yeVN0cmVhbTo6CiAgICAgICAgIGNiLkxvd1BhcnQgPSAoRFdPUkQpLTE7CiAgICAgfQogCi0g ICAgVUxPTkcgd3JpdHRlbjsKKyAgICBVTE9ORyB3cml0dGVuID0gMDsKICAgICBVTE9ORyByZWFk ID0gbWluKGNiLkxvd1BhcnQsIChVTE9ORykobV9idWZmZXItPnNpemUoKS1tX3BvcykpOwogICAg IEhSRVNVTFQgaHIgPSBwc3RtLT5Xcml0ZShtX2J1ZmZlci0+ZGF0YSgpK21fcG9zLCByZWFkLCAm d3JpdHRlbik7CiAgICAgaWYgKHBjYldyaXR0ZW4pIHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2lu L1dlYkhpc3RvcnkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2luL1dlYkhpc3Rv cnkuY3BwCShyZXZpc2lvbiAxNzQ0NjUpCisrKyBTb3VyY2UvV2ViS2l0L3dpbi9XZWJIaXN0b3J5 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI2LDEyICsxMjYsMTIgQEAgc3RhdGljIHZvaWQgZ2V0 RGF5Qm91bmRhcmllcyhEQVRFIGRheSwgRAogICAgIGFkZERheVRvU3lzdGVtVGltZShiZWdpbm5p bmdPZk5leHREYXlMb2NhbFRpbWUpOwogCiAgICAgU1lTVEVNVElNRSBiZWdpbm5pbmdTeXN0ZW1U aW1lOwotICAgIDo6VHpTcGVjaWZpY0xvY2FsVGltZVRvU3lzdGVtVGltZSgwLCAmYmVnaW5uaW5n TG9jYWxUaW1lLCAmYmVnaW5uaW5nU3lzdGVtVGltZSk7Ci0gICAgOjpTeXN0ZW1UaW1lVG9WYXJp YW50VGltZSgmYmVnaW5uaW5nU3lzdGVtVGltZSwgJmJlZ2lubmluZ09mRGF5KTsKKyAgICBpZiAo OjpUelNwZWNpZmljTG9jYWxUaW1lVG9TeXN0ZW1UaW1lKDAsICZiZWdpbm5pbmdMb2NhbFRpbWUs ICZiZWdpbm5pbmdTeXN0ZW1UaW1lKSkKKyAgICAgICAgOjpTeXN0ZW1UaW1lVG9WYXJpYW50VGlt ZSgmYmVnaW5uaW5nU3lzdGVtVGltZSwgJmJlZ2lubmluZ09mRGF5KTsKIAogICAgIFNZU1RFTVRJ TUUgYmVnaW5uaW5nT2ZOZXh0RGF5U3lzdGVtVGltZTsKLSAgICA6OlR6U3BlY2lmaWNMb2NhbFRp bWVUb1N5c3RlbVRpbWUoMCwgJmJlZ2lubmluZ09mTmV4dERheUxvY2FsVGltZSwgJmJlZ2lubmlu Z09mTmV4dERheVN5c3RlbVRpbWUpOwotICAgIDo6U3lzdGVtVGltZVRvVmFyaWFudFRpbWUoJmJl Z2lubmluZ09mTmV4dERheVN5c3RlbVRpbWUsICZiZWdpbm5pbmdPZk5leHREYXkpOworICAgIGlm ICg6OlR6U3BlY2lmaWNMb2NhbFRpbWVUb1N5c3RlbVRpbWUoMCwgJmJlZ2lubmluZ09mTmV4dERh eUxvY2FsVGltZSwgJmJlZ2lubmluZ09mTmV4dERheVN5c3RlbVRpbWUpKQorICAgICAgICA6OlN5 c3RlbVRpbWVUb1ZhcmlhbnRUaW1lKCZiZWdpbm5pbmdPZk5leHREYXlTeXN0ZW1UaW1lLCAmYmVn aW5uaW5nT2ZOZXh0RGF5KTsKIH0KIAogc3RhdGljIGlubGluZSBEQVRFIGJlZ2lubmluZ09mRGF5 KERBVEUgZGF0ZSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCShyZXZpc2lvbiAxNzQ0NjUpCisr KyBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjY5Miw4 ICsyNjkyLDggQEAgYm9vbCBXZWJWaWV3OjpzaG91bGRJbml0aWFsaXplVHJhY2tQb2ludAogICAg ICAgICBMIlNvZnR3YXJlXFxTeW5hcHRpY3NcXFN5blRQRW5oXFxVbHRyYU5hdlBTMiIgfTsKIAog ICAgIGZvciAoaW50IGkgPSAwOyBpIDwgNTsgKytpKSB7Ci0gICAgICAgIEhLRVkgdHJhY2tQb2lu dEtleTsKLSAgICAgICAgaW50IHJlYWRLZXlSZXN1bHQgPSA6OlJlZ09wZW5LZXlFeFcoSEtFWV9D VVJSRU5UX1VTRVIsIHRyYWNrUG9pbnRLZXlzW2ldLCAwLCBLRVlfUkVBRCwgJnRyYWNrUG9pbnRL ZXkpOworICAgICAgICBIS0VZIHRyYWNrUG9pbnRLZXkgPSBudWxscHRyOworICAgICAgICBMU1RB VFVTIHJlYWRLZXlSZXN1bHQgPSA6OlJlZ09wZW5LZXlFeFcoSEtFWV9DVVJSRU5UX1VTRVIsIHRy YWNrUG9pbnRLZXlzW2ldLCAwLCBLRVlfUkVBRCwgJnRyYWNrUG9pbnRLZXkpOwogICAgICAgICA6 OlJlZ0Nsb3NlS2V5KHRyYWNrUG9pbnRLZXkpOwogICAgICAgICBpZiAocmVhZEtleVJlc3VsdCA9 PSBFUlJPUl9TVUNDRVNTKSB7CiAgICAgICAgICAgICBzaG91bGRDcmVhdGVTY3JvbGxiYXJzID0g dHJ1ZTsKQEAgLTI5MjgsNyArMjkyOCw3IEBAIHZvaWQgV2ViVmlldzo6ZGlzcGF0Y2hEaWRSZWNl aXZlSWNvbkZyb20KIAogICAgICAgICBCaXRtYXBJbmZvIGJtSW5mbyA9IEJpdG1hcEluZm86OmNy ZWF0ZShzeik7CiAKLSAgICAgICAgSEJJVE1BUCBoQml0bWFwID0gMDsKKyAgICAgICAgSEJJVE1B UCBoQml0bWFwID0gbnVsbHB0cjsKIAogICAgICAgICBJbWFnZSogaWNvbiA9IGljb25EYXRhYmFz ZSgpLnN5bmNocm9ub3VzSWNvbkZvclBhZ2VVUkwoc3RyLCBzeik7CiAKQEAgLTI5MzksNyArMjkz OSw3IEBAIHZvaWQgV2ViVmlldzo6ZGlzcGF0Y2hEaWRSZWNlaXZlSWNvbkZyb20KICAgICAgICAg fQogCiAgICAgICAgIEhSRVNVTFQgaHIgPSBtX2ZyYW1lTG9hZERlbGVnYXRlLT5kaWRSZWNlaXZl SWNvbih0aGlzLCBoQml0bWFwLCBmcmFtZSk7Ci0gICAgICAgIGlmIChociA9PSBFX05PVElNUEwp CisgICAgICAgIGlmICgoaHIgPT0gRV9OT1RJTVBMKSAmJiBoQml0bWFwKQogICAgICAgICAgICAg RGVsZXRlT2JqZWN0KGhCaXRtYXApOwogICAgIH0KIH0KQEAgLTUzMzAsMTcgKzUzMzAsMTMgQEAg SFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJWaWV3OjpjYW5IYQogICAgIHJldHVybiBTX09L OwogfQogCi1IUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYlZpZXc6OnN0YW5kYXJkVXNlckFn ZW50V2l0aEFwcGxpY2F0aW9uTmFtZSggCi0gICAgQlNUUiBhcHBsaWNhdGlvbk5hbWUsCi0gICAg QlNUUiogZ3JvdXBOYW1lKQorSFJFU1VMVCBXZWJWaWV3OjpzdGFuZGFyZFVzZXJBZ2VudFdpdGhB cHBsaWNhdGlvbk5hbWUoQlNUUiBhcHBsaWNhdGlvbk5hbWUsIEJTVFIqIGdyb3VwTmFtZSkKIHsK ICAgICBpZiAoIWdyb3VwTmFtZSkgewogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAg ICAgICAgcmV0dXJuIEVfUE9JTlRFUjsKICAgICB9CiAKLSAgICAqZ3JvdXBOYW1lOwotCiAgICAg aWYgKCFhcHBsaWNhdGlvbk5hbWUpIHsKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAg ICAgICAgIHJldHVybiBFX1BPSU5URVI7CkluZGV4OiBTb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3Jl U3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv d2luL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAJKHJldmlzaW9uIDE3NDQ2NSkK KysrIFNvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTU5OCw4ICs1OTgsOSBAQCB2b2lkIFdlYkNocm9tZUNsaWVudDo6 ZXhjZWVkZWREYXRhYmFzZVF1CiAgICAgICAgICAgICBITU9EVUxFIHNhZmFyaUhhbmRsZSA9IEdl dE1vZHVsZUhhbmRsZVcoTCJTYWZhcmkuZXhlIik7CiAgICAgICAgICAgICBpZiAoIXNhZmFyaUhh bmRsZSkKICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICBHZXRNb2R1bGVGaWxl TmFtZShzYWZhcmlIYW5kbGUsIHBhdGgsIFdURl9BUlJBWV9MRU5HVEgocGF0aCkpOwotICAgICAg ICAgICAgRFdPUkQgaGFuZGxlOworICAgICAgICAgICAgaWYgKCE6OkdldE1vZHVsZUZpbGVOYW1l KHNhZmFyaUhhbmRsZSwgcGF0aCwgV1RGX0FSUkFZX0xFTkdUSChwYXRoKSkpCisgICAgICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICAgICAgRFdPUkQgaGFuZGxlID0gMDsKICAgICAgICAgICAg IERXT1JEIHZlcnNpb25TaXplID0gR2V0RmlsZVZlcnNpb25JbmZvU2l6ZShwYXRoLCAmaGFuZGxl KTsKICAgICAgICAgICAgIGlmICghdmVyc2lvblNpemUpCiAgICAgICAgICAgICAgICAgcmV0dXJu Owo=