28378 2009-08-16 22:12:17 -0700 HTMLViewSourceDocument should use smart pointers 2009-08-17 00:14:57 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 darin darin oldest_to_newest 140658 0 darin 2009-08-16 22:12:17 -0700 The code in HTMLViewSourceDocument uses raw pointers in a few places where it should use smart pointers instead. 140659 1 34950 darin 2009-08-16 22:16:33 -0700 Created attachment 34950 patch 140660 2 34951 darin 2009-08-16 22:17:22 -0700 Created attachment 34951 patch 140683 3 darin 2009-08-17 00:14:57 -0700 http://trac.webkit.org/changeset/47353 34950 2009-08-16 22:16:33 -0700 2009-08-16 22:17:22 -0700 patch ViewSourcePatch.txt text/plain 7274 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NzM0NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzUgQEAKKzIwMDktMDgtMTYgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhUTUxW aWV3U291cmNlRG9jdW1lbnQgc2hvdWxkIHVzZSBzbWFydCBwb2ludGVycworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjgzNzgKKworICAgICAgICAqIGh0 bWwvSFRNTFZpZXdTb3VyY2VEb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVmll d1NvdXJjZURvY3VtZW50OjpIVE1MVmlld1NvdXJjZURvY3VtZW50KTogRG9uJ3QgaW5pdGlhbGl6 ZQorICAgICAgICBwb2ludGVycyBhbnkgbW9yZSBzaW5jZSBSZWZQdHIgc3RhcnRzIDAgYnkgZGVm YXVsdC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxWaWV3U291cmNlRG9jdW1lbnQ6OmNyZWF0ZUNv bnRhaW5pbmdUYWJsZSk6IFVzZSBtb3JlIHNwZWNpZmljCisgICAgICAgIHR5cGVzIGZvciBsb2Nh bCB2YXJpYWJsZXMuCisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlld1NvdXJjZURvY3VtZW50Ojph ZGRTcGFuV2l0aENsYXNzTmFtZSk6IFJldHVybiBhIFBhc3NSZWZQdHIsCisgICAgICAgIGFuZCB1 c2UgYSBSZWZQdHIgb2YgYSBtb3JlIHNwZWNpZmljIHR5cGUgZm9yIGEgbG9jYWwgdmFyaWFibGUu CisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlld1NvdXJjZURvY3VtZW50OjphZGRMaW5lKTogVXNl IG1vcmUgc3BlY2lmaWMgdHlwZXMgZm9yIGxvY2FsCisgICAgICAgIHZhcmlhYmxlcywgYW5kIHVz ZSBSZWZQdHIgYXMgd2VsbC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxWaWV3U291cmNlRG9jdW1l bnQ6OmFkZExpbmspOiBSZXR1cm4gYSBQYXNzUmVmUHRyLCBhbmQgdXNlIGEKKyAgICAgICAgUmVm UHRyIG9mIGEgbW9yZSBzcGVjaWZpYyB0eXBlIGZvciBhIGxvY2FsIHZhcmlhYmxlLgorCisgICAg ICAgICogaHRtbC9IVE1MVmlld1NvdXJjZURvY3VtZW50Lmg6IENoYW5nZSByZXR1cm4gdHlwZXMg dG8gUGFzc1JlZlB0ciBhbmQKKyAgICAgICAgZGF0YSBtZW1iZXIgdHlwZXMgdG8gUmVmUHRyLgor CisyMDA5LTA4LTE2ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdHlsZWRFbGVtZW50IHNob3Vs ZCB1c2UgQVNDSUlDVHlwZSBpbnN0ZWFkIG9mIGhhdmluZyBpdHMgb3duIHRvSGV4IGZ1bmN0aW9u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODM3Nwor CisgICAgICAgICogZG9tL1N0eWxlZEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5 bGVkRWxlbWVudDo6YWRkQ1NTQ29sb3IpOiBVc2UgaXNBU0NJSUhleERpZ2l0IGFuZCB0b0FTQ0lJ SGV4VmFsdWUuCisKIDIwMDktMDgtMTYgIE5pa29sYXMgWmltbWVybWFubiAgPG5pa29sYXMuemlt bWVybWFubkB0b3JjaG1vYmlsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR2VvcmdlIFN0 YWlrb3MuCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTFZpZXdTb3VyY2VEb2N1bWVudC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxWaWV3U291cmNlRG9jdW1lbnQuY3BwCShyZXZp c2lvbiA0NzMxMykKKysrIFdlYkNvcmUvaHRtbC9IVE1MVmlld1NvdXJjZURvY3VtZW50LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDYs IDIwMDggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAy MDA2LCAyMDA4LCAyMDA5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNDcsOSArNDcsNiBAQCB1c2luZyBuYW1lc3BhY2Ug SFRNTE5hbWVzOwogSFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6SFRNTFZpZXdTb3VyY2VEb2N1bWVu dChGcmFtZSogZnJhbWUsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUpCiAgICAgOiBIVE1MRG9jdW1l bnQoZnJhbWUpCiAgICAgLCBtX3R5cGUobWltZVR5cGUpCi0gICAgLCBtX2N1cnJlbnQoMCkKLSAg ICAsIG1fdGJvZHkoMCkKLSAgICAsIG1fdGQoMCkKIHsKICAgICBzZXRVc2VzQmVmb3JlQWZ0ZXJS dWxlcyh0cnVlKTsKIH0KQEAgLTcwLDIzICs2NywyMyBAQCBUb2tlbml6ZXIqIEhUTUxWaWV3U291 cmNlRG9jdW1lbnQ6OmNyZWF0CiAKIHZvaWQgSFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6Y3JlYXRl Q29udGFpbmluZ1RhYmxlKCkKIHsKLSAgICBSZWZQdHI8RWxlbWVudD4gaHRtbCA9IG5ldyBIVE1M SHRtbEVsZW1lbnQoaHRtbFRhZywgdGhpcyk7CisgICAgUmVmUHRyPEhUTUxIdG1sRWxlbWVudD4g aHRtbCA9IG5ldyBIVE1MSHRtbEVsZW1lbnQoaHRtbFRhZywgdGhpcyk7CiAgICAgYWRkQ2hpbGQo aHRtbCk7CiAgICAgaHRtbC0+YXR0YWNoKCk7Ci0gICAgUmVmUHRyPEVsZW1lbnQ+IGJvZHkgPSBu ZXcgSFRNTEJvZHlFbGVtZW50KGJvZHlUYWcsIHRoaXMpOworICAgIFJlZlB0cjxIVE1MQm9keUVs ZW1lbnQ+IGJvZHkgPSBuZXcgSFRNTEJvZHlFbGVtZW50KGJvZHlUYWcsIHRoaXMpOwogICAgIGh0 bWwtPmFkZENoaWxkKGJvZHkpOwogICAgIGJvZHktPmF0dGFjaCgpOwogICAgIAogICAgIC8vIENy ZWF0ZSBhIGxpbmUgZ3V0dGVyIGRpdiB0aGF0IGNhbiBiZSB1c2VkIHRvIG1ha2Ugc3VyZSB0aGUg Z3V0dGVyIGV4dGVuZHMgZG93biB0aGUgaGVpZ2h0IG9mIHRoZSB3aG9sZQogICAgIC8vIGRvY3Vt ZW50LgotICAgIFJlZlB0cjxFbGVtZW50PiBkaXYgPSBuZXcgSFRNTERpdkVsZW1lbnQoZGl2VGFn LCB0aGlzKTsKKyAgICBSZWZQdHI8SFRNTERpdkVsZW1lbnQ+IGRpdiA9IG5ldyBIVE1MRGl2RWxl bWVudChkaXZUYWcsIHRoaXMpOwogICAgIFJlZlB0cjxOYW1lZE1hcHBlZEF0dHJNYXA+IGF0dHJz ID0gTmFtZWRNYXBwZWRBdHRyTWFwOjpjcmVhdGUoKTsKICAgICBhdHRycy0+YWRkQXR0cmlidXRl KE1hcHBlZEF0dHJpYnV0ZTo6Y3JlYXRlKGNsYXNzQXR0ciwgIndlYmtpdC1saW5lLWd1dHRlci1i YWNrZHJvcCIpKTsKICAgICBkaXYtPnNldEF0dHJpYnV0ZU1hcChhdHRycy5yZWxlYXNlKCkpOwog ICAgIGJvZHktPmFkZENoaWxkKGRpdik7CiAgICAgZGl2LT5hdHRhY2goKTsKIAotICAgIFJlZlB0 cjxFbGVtZW50PiB0YWJsZSA9IG5ldyBIVE1MVGFibGVFbGVtZW50KHRhYmxlVGFnLCB0aGlzKTsK KyAgICBSZWZQdHI8SFRNTFRhYmxlRWxlbWVudD4gdGFibGUgPSBuZXcgSFRNTFRhYmxlRWxlbWVu dCh0YWJsZVRhZywgdGhpcyk7CiAgICAgYm9keS0+YWRkQ2hpbGQodGFibGUpOwogICAgIHRhYmxl LT5hdHRhY2goKTsKICAgICBtX3Rib2R5ID0gbmV3IEhUTUxUYWJsZVNlY3Rpb25FbGVtZW50KHRi b2R5VGFnLCB0aGlzKTsKQEAgLTIwNSwzMSArMjAyLDMxIEBAIHZvaWQgSFRNTFZpZXdTb3VyY2VE b2N1bWVudDo6YWRkVmlld1NvdXIKICAgICBhZGRUZXh0KHRleHQsICJ3ZWJraXQtaHRtbC1kb2N0 eXBlIik7CiB9CiAKLUVsZW1lbnQqIEhUTUxWaWV3U291cmNlRG9jdW1lbnQ6OmFkZFNwYW5XaXRo Q2xhc3NOYW1lKGNvbnN0IFN0cmluZyYgY2xhc3NOYW1lKQorUGFzc1JlZlB0cjxFbGVtZW50PiBI VE1MVmlld1NvdXJjZURvY3VtZW50OjphZGRTcGFuV2l0aENsYXNzTmFtZShjb25zdCBTdHJpbmcm IGNsYXNzTmFtZSkKIHsKICAgICBpZiAobV9jdXJyZW50ID09IG1fdGJvZHkpIHsKICAgICAgICAg YWRkTGluZShjbGFzc05hbWUpOwogICAgICAgICByZXR1cm4gbV9jdXJyZW50OwogICAgIH0KIAot ICAgIEVsZW1lbnQqIHNwYW4gPSBuZXcgSFRNTEVsZW1lbnQoc3BhblRhZywgdGhpcyk7CisgICAg UmVmUHRyPEhUTUxFbGVtZW50PiBzcGFuID0gbmV3IEhUTUxFbGVtZW50KHNwYW5UYWcsIHRoaXMp OwogICAgIFJlZlB0cjxOYW1lZE1hcHBlZEF0dHJNYXA+IGF0dHJzID0gTmFtZWRNYXBwZWRBdHRy TWFwOjpjcmVhdGUoKTsKICAgICBhdHRycy0+YWRkQXR0cmlidXRlKE1hcHBlZEF0dHJpYnV0ZTo6 Y3JlYXRlKGNsYXNzQXR0ciwgY2xhc3NOYW1lKSk7CiAgICAgc3Bhbi0+c2V0QXR0cmlidXRlTWFw KGF0dHJzLnJlbGVhc2UoKSk7CiAgICAgbV9jdXJyZW50LT5hZGRDaGlsZChzcGFuKTsKICAgICBz cGFuLT5hdHRhY2goKTsKLSAgICByZXR1cm4gc3BhbjsKKyAgICByZXR1cm4gc3Bhbi5yZWxlYXNl KCk7CiB9CiAKIHZvaWQgSFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6YWRkTGluZShjb25zdCBTdHJp bmcmIGNsYXNzTmFtZSkKIHsKICAgICAvLyBDcmVhdGUgYSB0YWJsZSByb3cuCi0gICAgUmVmUHRy PEVsZW1lbnQ+IHRyb3cgPSBuZXcgSFRNTFRhYmxlUm93RWxlbWVudCh0clRhZywgdGhpcyk7Cisg ICAgUmVmUHRyPEhUTUxUYWJsZVJvd0VsZW1lbnQ+IHRyb3cgPSBuZXcgSFRNTFRhYmxlUm93RWxl bWVudCh0clRhZywgdGhpcyk7CiAgICAgbV90Ym9keS0+YWRkQ2hpbGQodHJvdyk7CiAgICAgdHJv dy0+YXR0YWNoKCk7CiAgICAgCiAgICAgLy8gQ3JlYXRlIGEgY2VsbCB0aGF0IHdpbGwgaG9sZCB0 aGUgbGluZSBudW1iZXIgKGl0IGlzIGdlbmVyYXRlZCBpbiB0aGUgc3R5bGVzaGVldCB1c2luZyBj b3VudGVycykuCi0gICAgRWxlbWVudCogdGQgPSBuZXcgSFRNTFRhYmxlQ2VsbEVsZW1lbnQodGRU YWcsIHRoaXMpOworICAgIFJlZlB0cjxIVE1MVGFibGVDZWxsRWxlbWVudD4gdGQgPSBuZXcgSFRN TFRhYmxlQ2VsbEVsZW1lbnQodGRUYWcsIHRoaXMpOwogICAgIFJlZlB0cjxOYW1lZE1hcHBlZEF0 dHJNYXA+IGF0dHJzID0gTmFtZWRNYXBwZWRBdHRyTWFwOjpjcmVhdGUoKTsKICAgICBhdHRycy0+ YWRkQXR0cmlidXRlKE1hcHBlZEF0dHJpYnV0ZTo6Y3JlYXRlKGNsYXNzQXR0ciwgIndlYmtpdC1s aW5lLW51bWJlciIpKTsKICAgICB0ZC0+c2V0QXR0cmlidXRlTWFwKGF0dHJzLnJlbGVhc2UoKSk7 CkBAIC0yODksMTMgKzI4NiwxMyBAQCB2b2lkIEhUTUxWaWV3U291cmNlRG9jdW1lbnQ6OmFkZFRl eHQoY29uCiAgICAgICAgIG1fY3VycmVudCA9IG1fdGJvZHk7CiB9CiAKLUVsZW1lbnQqIEhUTUxW aWV3U291cmNlRG9jdW1lbnQ6OmFkZExpbmsoY29uc3QgU3RyaW5nJiB1cmwsIGJvb2wgaXNBbmNo b3IpCitQYXNzUmVmUHRyPEVsZW1lbnQ+IEhUTUxWaWV3U291cmNlRG9jdW1lbnQ6OmFkZExpbmso Y29uc3QgU3RyaW5nJiB1cmwsIGJvb2wgaXNBbmNob3IpCiB7CiAgICAgaWYgKG1fY3VycmVudCA9 PSBtX3Rib2R5KQogICAgICAgICBhZGRMaW5lKCJ3ZWJraXQtaHRtbC10YWciKTsKICAgICAKICAg ICAvLyBOb3cgY3JlYXRlIGEgbGluayBmb3IgdGhlIGF0dHJpYnV0ZSB2YWx1ZSBpbnN0ZWFkIG9m IGEgc3Bhbi4KLSAgICBFbGVtZW50KiBhbmNob3IgPSBuZXcgSFRNTEFuY2hvckVsZW1lbnQoYVRh ZywgdGhpcyk7CisgICAgUmVmUHRyPEhUTUxBbmNob3JFbGVtZW50PiBhbmNob3IgPSBuZXcgSFRN TEFuY2hvckVsZW1lbnQodGhpcyk7CiAgICAgUmVmUHRyPE5hbWVkTWFwcGVkQXR0ck1hcD4gYXR0 cnMgPSBOYW1lZE1hcHBlZEF0dHJNYXA6OmNyZWF0ZSgpOwogICAgIGNvbnN0IGNoYXIqIGNsYXNz VmFsdWU7CiAgICAgaWYgKGlzQW5jaG9yKQpAQCAtMzA4LDcgKzMwNSw3IEBAIEVsZW1lbnQqIEhU TUxWaWV3U291cmNlRG9jdW1lbnQ6OmFkZExpbmsKICAgICBhbmNob3ItPnNldEF0dHJpYnV0ZU1h cChhdHRycy5yZWxlYXNlKCkpOwogICAgIG1fY3VycmVudC0+YWRkQ2hpbGQoYW5jaG9yKTsKICAg ICBhbmNob3ItPmF0dGFjaCgpOwotICAgIHJldHVybiBhbmNob3I7CisgICAgcmV0dXJuIGFuY2hv ci5yZWxlYXNlKCk7CiB9CiAKIH0KSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MVmlld1NvdXJjZURv Y3VtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxWaWV3U291cmNlRG9jdW1l bnQuaAkocmV2aXNpb24gNDczMTMpCisrKyBXZWJDb3JlL2h0bWwvSFRNTFZpZXdTb3VyY2VEb2N1 bWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMCw2ICszMCw5IEBACiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKIGNsYXNzIERvY3R5cGVUb2tlbjsKK2NsYXNzIEhUTUxUYWJsZUNlbGxFbGVtZW50Owor Y2xhc3MgSFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQ7CisKIHN0cnVjdCBUb2tlbjsKIAogY2xhc3Mg SFRNTFZpZXdTb3VyY2VEb2N1bWVudCA6IHB1YmxpYyBIVE1MRG9jdW1lbnQgewpAQCAtNTAsMTUg KzUzLDE1IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBUb2tlbml6ZXIqIGNyZWF0ZVRva2VuaXpl cigpOwogCiAgICAgdm9pZCBjcmVhdGVDb250YWluaW5nVGFibGUoKTsKLSAgICBFbGVtZW50KiBh ZGRTcGFuV2l0aENsYXNzTmFtZShjb25zdCBTdHJpbmcmKTsKKyAgICBQYXNzUmVmUHRyPEVsZW1l bnQ+IGFkZFNwYW5XaXRoQ2xhc3NOYW1lKGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgYWRkTGlu ZShjb25zdCBTdHJpbmcmIGNsYXNzTmFtZSk7CiAgICAgdm9pZCBhZGRUZXh0KGNvbnN0IFN0cmlu ZyYgdGV4dCwgY29uc3QgU3RyaW5nJiBjbGFzc05hbWUpOwotICAgIEVsZW1lbnQqIGFkZExpbmso Y29uc3QgU3RyaW5nJiB1cmwsIGJvb2wgaXNBbmNob3IpOworICAgIFBhc3NSZWZQdHI8RWxlbWVu dD4gYWRkTGluayhjb25zdCBTdHJpbmcmIHVybCwgYm9vbCBpc0FuY2hvcik7CiAKICAgICBTdHJp bmcgbV90eXBlOwotICAgIEVsZW1lbnQqIG1fY3VycmVudDsKLSAgICBFbGVtZW50KiBtX3Rib2R5 OwotICAgIEVsZW1lbnQqIG1fdGQ7CisgICAgUmVmUHRyPEVsZW1lbnQ+IG1fY3VycmVudDsKKyAg ICBSZWZQdHI8SFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQ+IG1fdGJvZHk7CisgICAgUmVmUHRyPEhU TUxUYWJsZUNlbGxFbGVtZW50PiBtX3RkOwogfTsKIAogfQo= 34951 2009-08-16 22:17:22 -0700 2009-08-16 22:41:07 -0700 patch ViewSourcePatch.txt text/plain 6921 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NzM0NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMDktMDgtMTYgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhUTUxW aWV3U291cmNlRG9jdW1lbnQgc2hvdWxkIHVzZSBzbWFydCBwb2ludGVycworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjgzNzgKKworICAgICAgICAqIGh0 bWwvSFRNTFZpZXdTb3VyY2VEb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVmll d1NvdXJjZURvY3VtZW50OjpIVE1MVmlld1NvdXJjZURvY3VtZW50KTogRG9uJ3QgaW5pdGlhbGl6 ZQorICAgICAgICBwb2ludGVycyBhbnkgbW9yZSBzaW5jZSBSZWZQdHIgc3RhcnRzIDAgYnkgZGVm YXVsdC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxWaWV3U291cmNlRG9jdW1lbnQ6OmNyZWF0ZUNv bnRhaW5pbmdUYWJsZSk6IFVzZSBtb3JlIHNwZWNpZmljCisgICAgICAgIHR5cGVzIGZvciBsb2Nh bCB2YXJpYWJsZXMuCisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlld1NvdXJjZURvY3VtZW50Ojph ZGRTcGFuV2l0aENsYXNzTmFtZSk6IFJldHVybiBhIFBhc3NSZWZQdHIsCisgICAgICAgIGFuZCB1 c2UgYSBSZWZQdHIgb2YgYSBtb3JlIHNwZWNpZmljIHR5cGUgZm9yIGEgbG9jYWwgdmFyaWFibGUu CisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlld1NvdXJjZURvY3VtZW50OjphZGRMaW5lKTogVXNl IG1vcmUgc3BlY2lmaWMgdHlwZXMgZm9yIGxvY2FsCisgICAgICAgIHZhcmlhYmxlcywgYW5kIHVz ZSBSZWZQdHIgYXMgd2VsbC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxWaWV3U291cmNlRG9jdW1l bnQ6OmFkZExpbmspOiBSZXR1cm4gYSBQYXNzUmVmUHRyLCBhbmQgdXNlIGEKKyAgICAgICAgUmVm UHRyIG9mIGEgbW9yZSBzcGVjaWZpYyB0eXBlIGZvciBhIGxvY2FsIHZhcmlhYmxlLgorCisgICAg ICAgICogaHRtbC9IVE1MVmlld1NvdXJjZURvY3VtZW50Lmg6IENoYW5nZSByZXR1cm4gdHlwZXMg dG8gUGFzc1JlZlB0ciBhbmQKKyAgICAgICAgZGF0YSBtZW1iZXIgdHlwZXMgdG8gUmVmUHRyLgor CiAyMDA5LTA4LTE2ICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuaWtvbGFzLnppbW1lcm1hbm5AdG9y Y2htb2JpbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb3JnZSBTdGFpa29zLgpJbmRl eDogV2ViQ29yZS9odG1sL0hUTUxWaWV3U291cmNlRG9jdW1lbnQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvaHRtbC9IVE1MVmlld1NvdXJjZURvY3VtZW50LmNwcAkocmV2aXNpb24gNDczMTMp CisrKyBXZWJDb3JlL2h0bWwvSFRNTFZpZXdTb3VyY2VEb2N1bWVudC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA2LCAyMDA4IEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNiwgMjAwOCwg MjAwOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRp b24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAg KiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMKQEAgLTQ3LDkgKzQ3LDYgQEAgdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsK IEhUTUxWaWV3U291cmNlRG9jdW1lbnQ6OkhUTUxWaWV3U291cmNlRG9jdW1lbnQoRnJhbWUqIGZy YW1lLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlKQogICAgIDogSFRNTERvY3VtZW50KGZyYW1lKQog ICAgICwgbV90eXBlKG1pbWVUeXBlKQotICAgICwgbV9jdXJyZW50KDApCi0gICAgLCBtX3Rib2R5 KDApCi0gICAgLCBtX3RkKDApCiB7CiAgICAgc2V0VXNlc0JlZm9yZUFmdGVyUnVsZXModHJ1ZSk7 CiB9CkBAIC03MCwyMyArNjcsMjMgQEAgVG9rZW5pemVyKiBIVE1MVmlld1NvdXJjZURvY3VtZW50 OjpjcmVhdAogCiB2b2lkIEhUTUxWaWV3U291cmNlRG9jdW1lbnQ6OmNyZWF0ZUNvbnRhaW5pbmdU YWJsZSgpCiB7Ci0gICAgUmVmUHRyPEVsZW1lbnQ+IGh0bWwgPSBuZXcgSFRNTEh0bWxFbGVtZW50 KGh0bWxUYWcsIHRoaXMpOworICAgIFJlZlB0cjxIVE1MSHRtbEVsZW1lbnQ+IGh0bWwgPSBuZXcg SFRNTEh0bWxFbGVtZW50KGh0bWxUYWcsIHRoaXMpOwogICAgIGFkZENoaWxkKGh0bWwpOwogICAg IGh0bWwtPmF0dGFjaCgpOwotICAgIFJlZlB0cjxFbGVtZW50PiBib2R5ID0gbmV3IEhUTUxCb2R5 RWxlbWVudChib2R5VGFnLCB0aGlzKTsKKyAgICBSZWZQdHI8SFRNTEJvZHlFbGVtZW50PiBib2R5 ID0gbmV3IEhUTUxCb2R5RWxlbWVudChib2R5VGFnLCB0aGlzKTsKICAgICBodG1sLT5hZGRDaGls ZChib2R5KTsKICAgICBib2R5LT5hdHRhY2goKTsKICAgICAKICAgICAvLyBDcmVhdGUgYSBsaW5l IGd1dHRlciBkaXYgdGhhdCBjYW4gYmUgdXNlZCB0byBtYWtlIHN1cmUgdGhlIGd1dHRlciBleHRl bmRzIGRvd24gdGhlIGhlaWdodCBvZiB0aGUgd2hvbGUKICAgICAvLyBkb2N1bWVudC4KLSAgICBS ZWZQdHI8RWxlbWVudD4gZGl2ID0gbmV3IEhUTUxEaXZFbGVtZW50KGRpdlRhZywgdGhpcyk7Cisg ICAgUmVmUHRyPEhUTUxEaXZFbGVtZW50PiBkaXYgPSBuZXcgSFRNTERpdkVsZW1lbnQoZGl2VGFn LCB0aGlzKTsKICAgICBSZWZQdHI8TmFtZWRNYXBwZWRBdHRyTWFwPiBhdHRycyA9IE5hbWVkTWFw cGVkQXR0ck1hcDo6Y3JlYXRlKCk7CiAgICAgYXR0cnMtPmFkZEF0dHJpYnV0ZShNYXBwZWRBdHRy aWJ1dGU6OmNyZWF0ZShjbGFzc0F0dHIsICJ3ZWJraXQtbGluZS1ndXR0ZXItYmFja2Ryb3AiKSk7 CiAgICAgZGl2LT5zZXRBdHRyaWJ1dGVNYXAoYXR0cnMucmVsZWFzZSgpKTsKICAgICBib2R5LT5h ZGRDaGlsZChkaXYpOwogICAgIGRpdi0+YXR0YWNoKCk7CiAKLSAgICBSZWZQdHI8RWxlbWVudD4g dGFibGUgPSBuZXcgSFRNTFRhYmxlRWxlbWVudCh0YWJsZVRhZywgdGhpcyk7CisgICAgUmVmUHRy PEhUTUxUYWJsZUVsZW1lbnQ+IHRhYmxlID0gbmV3IEhUTUxUYWJsZUVsZW1lbnQodGFibGVUYWcs IHRoaXMpOwogICAgIGJvZHktPmFkZENoaWxkKHRhYmxlKTsKICAgICB0YWJsZS0+YXR0YWNoKCk7 CiAgICAgbV90Ym9keSA9IG5ldyBIVE1MVGFibGVTZWN0aW9uRWxlbWVudCh0Ym9keVRhZywgdGhp cyk7CkBAIC0yMDUsMzEgKzIwMiwzMSBAQCB2b2lkIEhUTUxWaWV3U291cmNlRG9jdW1lbnQ6OmFk ZFZpZXdTb3VyCiAgICAgYWRkVGV4dCh0ZXh0LCAid2Via2l0LWh0bWwtZG9jdHlwZSIpOwogfQog Ci1FbGVtZW50KiBIVE1MVmlld1NvdXJjZURvY3VtZW50OjphZGRTcGFuV2l0aENsYXNzTmFtZShj b25zdCBTdHJpbmcmIGNsYXNzTmFtZSkKK1Bhc3NSZWZQdHI8RWxlbWVudD4gSFRNTFZpZXdTb3Vy Y2VEb2N1bWVudDo6YWRkU3BhbldpdGhDbGFzc05hbWUoY29uc3QgU3RyaW5nJiBjbGFzc05hbWUp CiB7CiAgICAgaWYgKG1fY3VycmVudCA9PSBtX3Rib2R5KSB7CiAgICAgICAgIGFkZExpbmUoY2xh c3NOYW1lKTsKICAgICAgICAgcmV0dXJuIG1fY3VycmVudDsKICAgICB9CiAKLSAgICBFbGVtZW50 KiBzcGFuID0gbmV3IEhUTUxFbGVtZW50KHNwYW5UYWcsIHRoaXMpOworICAgIFJlZlB0cjxIVE1M RWxlbWVudD4gc3BhbiA9IG5ldyBIVE1MRWxlbWVudChzcGFuVGFnLCB0aGlzKTsKICAgICBSZWZQ dHI8TmFtZWRNYXBwZWRBdHRyTWFwPiBhdHRycyA9IE5hbWVkTWFwcGVkQXR0ck1hcDo6Y3JlYXRl KCk7CiAgICAgYXR0cnMtPmFkZEF0dHJpYnV0ZShNYXBwZWRBdHRyaWJ1dGU6OmNyZWF0ZShjbGFz c0F0dHIsIGNsYXNzTmFtZSkpOwogICAgIHNwYW4tPnNldEF0dHJpYnV0ZU1hcChhdHRycy5yZWxl YXNlKCkpOwogICAgIG1fY3VycmVudC0+YWRkQ2hpbGQoc3Bhbik7CiAgICAgc3Bhbi0+YXR0YWNo KCk7Ci0gICAgcmV0dXJuIHNwYW47CisgICAgcmV0dXJuIHNwYW4ucmVsZWFzZSgpOwogfQogCiB2 b2lkIEhUTUxWaWV3U291cmNlRG9jdW1lbnQ6OmFkZExpbmUoY29uc3QgU3RyaW5nJiBjbGFzc05h bWUpCiB7CiAgICAgLy8gQ3JlYXRlIGEgdGFibGUgcm93LgotICAgIFJlZlB0cjxFbGVtZW50PiB0 cm93ID0gbmV3IEhUTUxUYWJsZVJvd0VsZW1lbnQodHJUYWcsIHRoaXMpOworICAgIFJlZlB0cjxI VE1MVGFibGVSb3dFbGVtZW50PiB0cm93ID0gbmV3IEhUTUxUYWJsZVJvd0VsZW1lbnQodHJUYWcs IHRoaXMpOwogICAgIG1fdGJvZHktPmFkZENoaWxkKHRyb3cpOwogICAgIHRyb3ctPmF0dGFjaCgp OwogICAgIAogICAgIC8vIENyZWF0ZSBhIGNlbGwgdGhhdCB3aWxsIGhvbGQgdGhlIGxpbmUgbnVt YmVyIChpdCBpcyBnZW5lcmF0ZWQgaW4gdGhlIHN0eWxlc2hlZXQgdXNpbmcgY291bnRlcnMpLgot ICAgIEVsZW1lbnQqIHRkID0gbmV3IEhUTUxUYWJsZUNlbGxFbGVtZW50KHRkVGFnLCB0aGlzKTsK KyAgICBSZWZQdHI8SFRNTFRhYmxlQ2VsbEVsZW1lbnQ+IHRkID0gbmV3IEhUTUxUYWJsZUNlbGxF bGVtZW50KHRkVGFnLCB0aGlzKTsKICAgICBSZWZQdHI8TmFtZWRNYXBwZWRBdHRyTWFwPiBhdHRy cyA9IE5hbWVkTWFwcGVkQXR0ck1hcDo6Y3JlYXRlKCk7CiAgICAgYXR0cnMtPmFkZEF0dHJpYnV0 ZShNYXBwZWRBdHRyaWJ1dGU6OmNyZWF0ZShjbGFzc0F0dHIsICJ3ZWJraXQtbGluZS1udW1iZXIi KSk7CiAgICAgdGQtPnNldEF0dHJpYnV0ZU1hcChhdHRycy5yZWxlYXNlKCkpOwpAQCAtMjg5LDEz ICsyODYsMTMgQEAgdm9pZCBIVE1MVmlld1NvdXJjZURvY3VtZW50OjphZGRUZXh0KGNvbgogICAg ICAgICBtX2N1cnJlbnQgPSBtX3Rib2R5OwogfQogCi1FbGVtZW50KiBIVE1MVmlld1NvdXJjZURv Y3VtZW50OjphZGRMaW5rKGNvbnN0IFN0cmluZyYgdXJsLCBib29sIGlzQW5jaG9yKQorUGFzc1Jl ZlB0cjxFbGVtZW50PiBIVE1MVmlld1NvdXJjZURvY3VtZW50OjphZGRMaW5rKGNvbnN0IFN0cmlu ZyYgdXJsLCBib29sIGlzQW5jaG9yKQogewogICAgIGlmIChtX2N1cnJlbnQgPT0gbV90Ym9keSkK ICAgICAgICAgYWRkTGluZSgid2Via2l0LWh0bWwtdGFnIik7CiAgICAgCiAgICAgLy8gTm93IGNy ZWF0ZSBhIGxpbmsgZm9yIHRoZSBhdHRyaWJ1dGUgdmFsdWUgaW5zdGVhZCBvZiBhIHNwYW4uCi0g ICAgRWxlbWVudCogYW5jaG9yID0gbmV3IEhUTUxBbmNob3JFbGVtZW50KGFUYWcsIHRoaXMpOwor ICAgIFJlZlB0cjxIVE1MQW5jaG9yRWxlbWVudD4gYW5jaG9yID0gbmV3IEhUTUxBbmNob3JFbGVt ZW50KHRoaXMpOwogICAgIFJlZlB0cjxOYW1lZE1hcHBlZEF0dHJNYXA+IGF0dHJzID0gTmFtZWRN YXBwZWRBdHRyTWFwOjpjcmVhdGUoKTsKICAgICBjb25zdCBjaGFyKiBjbGFzc1ZhbHVlOwogICAg IGlmIChpc0FuY2hvcikKQEAgLTMwOCw3ICszMDUsNyBAQCBFbGVtZW50KiBIVE1MVmlld1NvdXJj ZURvY3VtZW50OjphZGRMaW5rCiAgICAgYW5jaG9yLT5zZXRBdHRyaWJ1dGVNYXAoYXR0cnMucmVs ZWFzZSgpKTsKICAgICBtX2N1cnJlbnQtPmFkZENoaWxkKGFuY2hvcik7CiAgICAgYW5jaG9yLT5h dHRhY2goKTsKLSAgICByZXR1cm4gYW5jaG9yOworICAgIHJldHVybiBhbmNob3IucmVsZWFzZSgp OwogfQogCiB9CkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTFZpZXdTb3VyY2VEb2N1bWVudC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9IVE1MVmlld1NvdXJjZURvY3VtZW50LmgJKHJldmlz aW9uIDQ3MzEzKQorKysgV2ViQ29yZS9odG1sL0hUTUxWaWV3U291cmNlRG9jdW1lbnQuaAkod29y a2luZyBjb3B5KQpAQCAtMzAsNiArMzAsOSBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFz cyBEb2N0eXBlVG9rZW47CitjbGFzcyBIVE1MVGFibGVDZWxsRWxlbWVudDsKK2NsYXNzIEhUTUxU YWJsZVNlY3Rpb25FbGVtZW50OworCiBzdHJ1Y3QgVG9rZW47CiAKIGNsYXNzIEhUTUxWaWV3U291 cmNlRG9jdW1lbnQgOiBwdWJsaWMgSFRNTERvY3VtZW50IHsKQEAgLTUwLDE1ICs1MywxNSBAQCBw cml2YXRlOgogICAgIHZpcnR1YWwgVG9rZW5pemVyKiBjcmVhdGVUb2tlbml6ZXIoKTsKIAogICAg IHZvaWQgY3JlYXRlQ29udGFpbmluZ1RhYmxlKCk7Ci0gICAgRWxlbWVudCogYWRkU3BhbldpdGhD bGFzc05hbWUoY29uc3QgU3RyaW5nJik7CisgICAgUGFzc1JlZlB0cjxFbGVtZW50PiBhZGRTcGFu V2l0aENsYXNzTmFtZShjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIGFkZExpbmUoY29uc3QgU3Ry aW5nJiBjbGFzc05hbWUpOwogICAgIHZvaWQgYWRkVGV4dChjb25zdCBTdHJpbmcmIHRleHQsIGNv bnN0IFN0cmluZyYgY2xhc3NOYW1lKTsKLSAgICBFbGVtZW50KiBhZGRMaW5rKGNvbnN0IFN0cmlu ZyYgdXJsLCBib29sIGlzQW5jaG9yKTsKKyAgICBQYXNzUmVmUHRyPEVsZW1lbnQ+IGFkZExpbmso Y29uc3QgU3RyaW5nJiB1cmwsIGJvb2wgaXNBbmNob3IpOwogCiAgICAgU3RyaW5nIG1fdHlwZTsK LSAgICBFbGVtZW50KiBtX2N1cnJlbnQ7Ci0gICAgRWxlbWVudCogbV90Ym9keTsKLSAgICBFbGVt ZW50KiBtX3RkOworICAgIFJlZlB0cjxFbGVtZW50PiBtX2N1cnJlbnQ7CisgICAgUmVmUHRyPEhU TUxUYWJsZVNlY3Rpb25FbGVtZW50PiBtX3Rib2R5OworICAgIFJlZlB0cjxIVE1MVGFibGVDZWxs RWxlbWVudD4gbV90ZDsKIH07CiAKIH0K