105547 2012-12-20 09:55:00 -0800 Web Inspector: Mac WK1 Inspector can't save/load timeline data 2012-12-29 08:15:39 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 aroben aroben apavlov joepeck keishi loislo pfeldman pmuellr sam timothy vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 795511 0 aroben 2012-12-20 09:55:00 -0800 To reproduce: 1. Record a timeline using the Mac WebKit1 Inspector (not the Safari Inspector) 2. Right-click There's no "Save Timeline data…" option. And the "Load Timeline data…" option does nothing. 795514 1 180354 aroben 2012-12-20 09:58:52 -0800 Created attachment 180354 Patch 795520 2 180355 aroben 2012-12-20 10:01:37 -0800 Created attachment 180355 Patch 795523 3 180358 aroben 2012-12-20 10:03:18 -0800 Created attachment 180358 Patch 795525 4 180359 aroben 2012-12-20 10:04:14 -0800 Created attachment 180359 Patch 795531 5 aroben 2012-12-20 10:09:13 -0800 AFAICT there's no way to save/load timeline data in Safari's Inspector, so I don't think this patch will affect it. 795554 6 aroben 2012-12-20 10:40:08 -0800 And of course this won't affect Safari itself, since this is WK1-only. 795566 7 180359 pfeldman 2012-12-20 10:55:07 -0800 Comment on attachment 180359 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=180359&action=review > Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm:311 > + if (!forceSaveAs) { You probably want to check for url being a part of m_saveURLs. That way before writing into the FS user will see a file chooser. 795569 8 180359 aroben 2012-12-20 10:59:54 -0800 Comment on attachment 180359 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=180359&action=review >> Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm:311 >> + if (!forceSaveAs) { > > You probably want to check for url being a part of m_saveURLs. That way before writing into the FS user will see a file chooser. Ah, good call. I'll do that. 795573 9 180370 aroben 2012-12-20 11:03:42 -0800 Created attachment 180370 Patch 795731 10 180398 aroben 2012-12-20 13:26:11 -0800 Created attachment 180398 Patch 795733 11 aroben 2012-12-20 13:26:29 -0800 I updated the patch to work correctly when the Inspector is docked. 798135 12 180398 webkit.review.bot 2012-12-29 08:15:35 -0800 Comment on attachment 180398 Patch Clearing flags on attachment: 180398 Committed r138565: <http://trac.webkit.org/changeset/138565> 798136 13 webkit.review.bot 2012-12-29 08:15:39 -0800 All reviewed patches have been landed. Closing bug. 180354 2012-12-20 09:58:52 -0800 2012-12-20 10:01:32 -0800 Patch bug-105547-20121220125608.patch text/plain 6868 aroben U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4MjU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggODNmZjAxMzY2 ZWY5OWYyZTU3MGM5MTIyZDM3NjViNzZmOTA5ZjJiNi4uZTQwNDlkMWNmYzg0YWEwYjQ4NjkwZDM0 ODBlNGZjY2U5NDg5YWM1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEy LTEyLTIwICBBZGFtIFJvYmVuICA8YXJvYmVuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogTWFjIFdLMSBJbnNwZWN0b3IgY2FuJ3Qgc2F2ZS9sb2FkIHRpbWVsaW5lIGRhdGEK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTU0Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29y ZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lmg6IERlY2xhcmVkIG5ldyBvdmVycmlkZXMgYW5k CisgICAgICAgIG1lbWJlciB2YXJpYWJsZXMgbmVjZXNzYXJ5IGZvciBzYXZlIHN1cHBvcnQuCisK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW06CisgICAgICAg IChXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6c2F2ZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3JGcm9udGVuZENsaWVudDo6YXBwZW5kKToKKyAgICAgICAgSW1wbGVtZW50ZWQgdGhlc2UgdG8g bWFrZSBzYXZpbmcgdGltZWxpbmUgZGF0YSB3b3JrLiAoSXQgc2VlbXMgdG8gbWUKKyAgICAgICAg dGhlIEluc3BlY3RvckZyb250ZW5kQ2xpZW50IEFQSSBjb3VsZCBiZSBjbGVhbmVkIHVwIGEgYml0 LiBJIGhhZCB0bworICAgICAgICBsb29rIGF0IENocm9taXVtIHNvdXJjZSBjb2RlIHRvIGRldGVy bWluZSB0aGF0IEkgbmVlZGVkIHRvIGNhbGwgYmFjaworICAgICAgICBpbnRvIHRoZSBJbnNwZWN0 b3JGcm9udGVubmRBUEkgSlMgb2JqZWN0IGFmdGVyIHNhdmluZy9hcHBlbmRpbmcsIGFuZAorICAg ICAgICB0aGF0IEkgbmVlZGVkIHRvIGtlZXAgYSBtYXAgb2YgcGFzc2VkIFVSTHMgLT4gY2hvc2Vu IFVSTHMuKQorCisgICAgICAgICgtW1dlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXIgd2luZG93 OndpbGxQb3NpdGlvblNoZWV0OnVzaW5nUmVjdDpdKToKKyAgICAgICAgVHdlYWtlZCB0aGUgcG9z aXRpb24gb2YgdGhlIHNoZWV0IHNvIHRoYXQgb3Blbi9zYXZlIHNoZWV0cyBsb29rIGEKKyAgICAg ICAgbGl0dGxlIGJldHRlLnIKKworICAgICAgICAoLVtXZWJJbnNwZWN0b3JXaW5kb3dDb250cm9s bGVyIHdlYlZpZXc6cnVuT3BlblBhbmVsRm9yRmlsZUJ1dHRvbldpdGhSZXN1bHRMaXN0ZW5lcjph bGxvd011bHRpcGxlRmlsZXM6XSk6CisgICAgICAgIEltcGxlbWVudGVkIHRvIG1ha2UgbG9hZGlu ZyB0aW1lbGluZSBkYXRhIHdvcmsuCisKIDIwMTItMTItMjAgIElseWEgVGlraG9ub3Zza3kgIDxs b2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGZvciBj aHJvbWl1bSBtYWMgYWZ0ZXIgcjEzODIwNi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFj L1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmgKaW5kZXggY2IyZjkxN2ZlMmNhODY5 NjdkNzYyY2EyZmE0YmY5NTM4Njg3MTlmNi4uMmZlN2RjMGU0MTRjODU0YTFjZTU5NjNmMTc5YWIz NzhiMzI5N2YxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQv V2ViSW5zcGVjdG9yQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBv cnQvV2ViSW5zcGVjdG9yQ2xpZW50LmgKQEAgLTM3LDEwICszNywxMiBAQAogI2ltcG9ydCA8d3Rm L3RleHQvV1RGU3RyaW5nLmg+CiAKICNpZmRlZiBfX09CSkNfXworQGNsYXNzIE5TVVJMOwogQGNs YXNzIFdlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXI7CiBAY2xhc3MgV2ViTm9kZUhpZ2hsaWdo dGVyOwogQGNsYXNzIFdlYlZpZXc7CiAjZWxzZQorY2xhc3MgTlNVUkw7CiBjbGFzcyBXZWJJbnNw ZWN0b3JXaW5kb3dDb250cm9sbGVyOwogY2xhc3MgV2ViTm9kZUhpZ2hsaWdodGVyOwogY2xhc3Mg V2ViVmlldzsKQEAgLTExMCw3ICsxMTIsMTIgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICB2b2lk IHVwZGF0ZVdpbmRvd1RpdGxlKCkgY29uc3Q7CiAKKyAgICB2aXJ0dWFsIGJvb2wgY2FuU2F2ZSgp IE9WRVJSSURFIHsgcmV0dXJuIHRydWU7IH0KKyAgICB2aXJ0dWFsIHZvaWQgc2F2ZShjb25zdCBT dHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBjb250ZW50LCBib29sIGZvcmNlU2F2ZUFzKSBPVkVS UklERTsKKyAgICB2aXJ0dWFsIHZvaWQgYXBwZW5kKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBT dHJpbmcmIGNvbnRlbnQpIE9WRVJSSURFOworCiAgICAgV2ViVmlldyogbV9pbnNwZWN0ZWRXZWJW aWV3OwogICAgIFJldGFpblB0cjxXZWJJbnNwZWN0b3JXaW5kb3dDb250cm9sbGVyPiBtX3dpbmRv d0NvbnRyb2xsZXI7CiAgICAgU3RyaW5nIG1faW5zcGVjdGVkVVJMOworICAgIEhhc2hNYXA8U3Ry aW5nLCBSZXRhaW5QdHI8TlNVUkw+PiBtX3NhdmVVUkxzOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbSBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbQppbmRleCA1 MzM0ZjMyYzJhYzk5MmNhZTg2MWE4ZGJmMzUyY2ZiOTdmNTk2ZmNlLi5jYjgyZmVkMWQwMWI0NTE5 NjA0MTAzMzRiYzhiMmEyYjY5NzViY2I2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW0KKysrIGIvU291cmNlL1dlYktpdC9t YWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1tCkBAIC00MCw4ICs0MCwxMCBA QAogI2ltcG9ydCAiV2ViVUlEZWxlZ2F0ZS5oIgogI2ltcG9ydCAiV2ViUG9saWN5RGVsZWdhdGUu aCIKICNpbXBvcnQgIldlYlZpZXdJbnRlcm5hbC5oIgorI2ltcG9ydCA8V2ViQ29yZS9GcmFtZS5o PgogI2ltcG9ydCA8V2ViQ29yZS9JbnNwZWN0b3JDb250cm9sbGVyLmg+CiAjaW1wb3J0IDxXZWJD b3JlL1BhZ2UuaD4KKyNpbXBvcnQgPFdlYkNvcmUvU2NyaXB0VmFsdWUuaD4KICNpbXBvcnQgPFdl YkNvcmUvU29mdExpbmtpbmcuaD4KICNpbXBvcnQgPFdlYktpdC9ET01FeHRlbnNpb25zLmg+CiAj aW1wb3J0IDxXZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4KQEAgLTI5NCw2ICsyOTYsNDggQEAgdm9p ZCBXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6dXBkYXRlV2luZG93VGl0bGUoKSBjb25zdAog ICAgIFtbbV93aW5kb3dDb250cm9sbGVyLmdldCgpIHdpbmRvd10gc2V0VGl0bGU6dGl0bGVdOwog fQogCit2b2lkIFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50OjpzYXZlKGNvbnN0IFN0cmluZyYg cmVmVVJMLCBjb25zdCBTdHJpbmcmIHJlZkNvbnRlbnQsIGJvb2wgZm9yY2VTYXZlQXMpCit7Cisg ICAgU3RyaW5nIHVybCA9IHJlZlVSTDsKKyAgICBTdHJpbmcgY29udGVudCA9IHJlZkNvbnRlbnQ7 CisgICAgYXV0byBzYXZlVG9VUkwgPSBeKE5TVVJMICpVUkwpIHsKKyAgICAgICAgbV9zYXZlVVJM cy5zZXQodXJsLCBVUkwpOworCisgICAgICAgIFtjb250ZW50IHdyaXRlVG9VUkw6VVJMIGF0b21p Y2FsbHk6WUVTIGVuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nIGVycm9yOk5VTExdOworICAg ICAgICBjb3JlKFttX3dpbmRvd0NvbnRyb2xsZXIuZ2V0KCkgd2ViVmlld10pLT5tYWluRnJhbWUo KS0+c2NyaXB0KCktPmV4ZWN1dGVTY3JpcHQoW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJJ bnNwZWN0b3JGcm9udGVuZEFQSS5zYXZlZFVSTChcIiVAXCIpIiwgVVJMLmFic29sdXRlU3RyaW5n XSk7CisgICAgfTsKKworICAgIE5TVVJMICpVUkwgPSBbTlNVUkwgVVJMV2l0aFN0cmluZzp1cmxd OworICAgIGlmICghZm9yY2VTYXZlQXMpIHsKKyAgICAgICAgc2F2ZVRvVVJMKFVSTCk7CisgICAg ICAgIHJldHVybjsKKyAgICB9CisKKyAgICBOU1NhdmVQYW5lbCAqcGFuZWwgPSBbTlNTYXZlUGFu ZWwgc2F2ZVBhbmVsXTsKKyAgICBwYW5lbC5uYW1lRmllbGRTdHJpbmdWYWx1ZSA9IFVSTC5sYXN0 UGF0aENvbXBvbmVudDsKKyAgICBwYW5lbC5kaXJlY3RvcnlVUkwgPSBbVVJMIFVSTEJ5RGVsZXRp bmdMYXN0UGF0aENvbXBvbmVudF07CisKKyAgICBbcGFuZWwgYmVnaW5TaGVldE1vZGFsRm9yV2lu ZG93OlttX3dpbmRvd0NvbnRyb2xsZXIuZ2V0KCkgd2luZG93XSBjb21wbGV0aW9uSGFuZGxlcjpe KE5TSW50ZWdlciByZXN1bHQpIHsKKyAgICAgICAgaWYgKHJlc3VsdCA9PSBOU0ZpbGVIYW5kbGlu Z1BhbmVsQ2FuY2VsQnV0dG9uKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBBU1NFUlQo cmVzdWx0ID09IE5TRmlsZUhhbmRsaW5nUGFuZWxPS0J1dHRvbik7CisgICAgICAgIHNhdmVUb1VS TChwYW5lbC5VUkwpOworICAgIH1dOworfQorCit2b2lkIFdlYkluc3BlY3RvckZyb250ZW5kQ2xp ZW50OjphcHBlbmQoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgY29udGVudCkKK3sK KyAgICBSZXRhaW5QdHI8TlNVUkw+IFVSTCA9IG1fc2F2ZVVSTHMuZ2V0KHVybCk7CisgICAgaWYg KCFVUkwpCisgICAgICAgIFVSTCA9IFtOU1VSTCBVUkxXaXRoU3RyaW5nOnVybF07CisKKyAgICBO U0ZpbGVIYW5kbGUgKmhhbmRsZSA9IFtOU0ZpbGVIYW5kbGUgZmlsZUhhbmRsZUZvcldyaXRpbmdU b1VSTDpVUkwuZ2V0KCkgZXJyb3I6TlVMTF07CisgICAgW2hhbmRsZSBzZWVrVG9FbmRPZkZpbGVd OworICAgIFtoYW5kbGUgd3JpdGVEYXRhOltjb250ZW50IGRhdGFVc2luZ0VuY29kaW5nOk5TVVRG OFN0cmluZ0VuY29kaW5nXV07CisgICAgW2hhbmRsZSBjbG9zZUZpbGVdOworCisgICAgY29yZShb bV93aW5kb3dDb250cm9sbGVyLmdldCgpIHdlYlZpZXddKS0+bWFpbkZyYW1lKCktPnNjcmlwdCgp LT5leGVjdXRlU2NyaXB0KFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiSW5zcGVjdG9yRnJv bnRlbmRBUEkuYXBwZW5kZWRUb1VSTChcIiVAXCIpIiwgW1VSTC5nZXQoKSBhYnNvbHV0ZVN0cmlu Z11dKTsKK30KIAogLy8gTUFSSzogLQogCkBAIC00MzYsNiArNDgwLDE0IEBAIHZvaWQgV2ViSW5z cGVjdG9yRnJvbnRlbmRDbGllbnQ6OnVwZGF0ZVdpbmRvd1RpdGxlKCkgY29uc3QKIAogLy8gTUFS SzogLQogCistIChOU1JlY3Qpd2luZG93OihOU1dpbmRvdyAqKXdpbmRvdyB3aWxsUG9zaXRpb25T aGVldDooTlNXaW5kb3cgKilzaGVldCB1c2luZ1JlY3Q6KE5TUmVjdClyZWN0Cit7CisgICAgLy8g QXBwS2l0IGRvZXNuJ3Qga25vdyBhYm91dCBvdXIgSFRNTCB0b29sYmFyLCBhbmQgcGxhY2VzIHRo ZSBzaGVldCBqdXN0IGEgbGl0dGxlIGJpdCB0b28gaGlnaC4KKyAgICAvLyBGSVhNRTogSXQgd291 bGQgYmUgYmV0dGVyIHRvIGdldCB0aGUgaGVpZ2h0IG9mIHRoZSB0b29sYmFyIGFuZCB1c2UgaXQg aW4gdGhpcyBjYWxjdWxhdGlvbi4KKyAgICByZWN0Lm9yaWdpbi55IC09IDE7CisgICAgcmV0dXJu IHJlY3Q7Cit9CisKIC0gKEJPT0wpd2luZG93U2hvdWxkQ2xvc2U6KGlkKXNlbmRlcgogewogICAg IFtzZWxmIGRlc3Ryb3lJbnNwZWN0b3JWaWV3OnRydWVdOwpAQCAtNjE2LDYgKzY2OCwyOSBAQCB2 b2lkIFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50Ojp1cGRhdGVXaW5kb3dUaXRsZSgpIGNvbnN0 CiAgICAgcmV0dXJuIFdlYkRyYWdEZXN0aW5hdGlvbkFjdGlvbk5vbmU7CiB9CiAKKy0gKHZvaWQp d2ViVmlldzooV2ViVmlldyAqKXNlbmRlciBydW5PcGVuUGFuZWxGb3JGaWxlQnV0dG9uV2l0aFJl c3VsdExpc3RlbmVyOihpZDxXZWJPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lcj4pcmVzdWx0TGlzdGVu ZXIgYWxsb3dNdWx0aXBsZUZpbGVzOihCT09MKWFsbG93TXVsdGlwbGVGaWxlcworeworICAgIE5T T3BlblBhbmVsICpwYW5lbCA9IFtOU09wZW5QYW5lbCBvcGVuUGFuZWxdOworICAgIHBhbmVsLmNh bkNob29zZURpcmVjdG9yaWVzID0gTk87CisgICAgcGFuZWwuY2FuQ2hvb3NlRmlsZXMgPSBZRVM7 CisgICAgcGFuZWwuYWxsb3dzTXVsdGlwbGVTZWxlY3Rpb24gPSBhbGxvd011bHRpcGxlRmlsZXM7 CisKKyAgICBbcGFuZWwgYmVnaW5TaGVldE1vZGFsRm9yV2luZG93OnNlbGYud2luZG93IGNvbXBs ZXRpb25IYW5kbGVyOl4oTlNJbnRlZ2VyIHJlc3VsdCkgeworICAgICAgICBpZiAocmVzdWx0ID09 IE5TRmlsZUhhbmRsaW5nUGFuZWxDYW5jZWxCdXR0b24pIHsKKyAgICAgICAgICAgIFtyZXN1bHRM aXN0ZW5lciBjYW5jZWxdOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAg IEFTU0VSVChyZXN1bHQgPT0gTlNGaWxlSGFuZGxpbmdQYW5lbE9LQnV0dG9uKTsKKworICAgICAg ICBOU0FycmF5ICpVUkxzID0gcGFuZWwuVVJMczsKKyAgICAgICAgTlNNdXRhYmxlQXJyYXkgKmZp bGVuYW1lcyA9IFtOU011dGFibGVBcnJheSBhcnJheVdpdGhDYXBhY2l0eTpVUkxzLmNvdW50XTsK KyAgICAgICAgZm9yIChOU1VSTCAqVVJMIGluIFVSTHMpIHsKKyAgICAgICAgICAgIFtmaWxlbmFt ZXMgYWRkT2JqZWN0OlVSTC5wYXRoXTsKKyAgICAgICAgfQorICAgICAgICBbcmVzdWx0TGlzdGVu ZXIgY2hvb3NlRmlsZW5hbWVzOmZpbGVuYW1lc107CisgICAgfV07Cit9CisKIC8vIE1BUks6IC0K IC8vIE1BUks6IFBvbGljeSBkZWxlZ2F0ZQogCg== 180355 2012-12-20 10:01:37 -0800 2012-12-20 10:03:13 -0800 Patch bug-105547-20121220125853.patch text/plain 6862 aroben U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4MjU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggODNmZjAxMzY2 ZWY5OWYyZTU3MGM5MTIyZDM3NjViNzZmOTA5ZjJiNi4uZTQwNDlkMWNmYzg0YWEwYjQ4NjkwZDM0 ODBlNGZjY2U5NDg5YWM1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEy LTEyLTIwICBBZGFtIFJvYmVuICA8YXJvYmVuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogTWFjIFdLMSBJbnNwZWN0b3IgY2FuJ3Qgc2F2ZS9sb2FkIHRpbWVsaW5lIGRhdGEK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTU0Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29y ZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lmg6IERlY2xhcmVkIG5ldyBvdmVycmlkZXMgYW5k CisgICAgICAgIG1lbWJlciB2YXJpYWJsZXMgbmVjZXNzYXJ5IGZvciBzYXZlIHN1cHBvcnQuCisK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW06CisgICAgICAg IChXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6c2F2ZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3JGcm9udGVuZENsaWVudDo6YXBwZW5kKToKKyAgICAgICAgSW1wbGVtZW50ZWQgdGhlc2UgdG8g bWFrZSBzYXZpbmcgdGltZWxpbmUgZGF0YSB3b3JrLiAoSXQgc2VlbXMgdG8gbWUKKyAgICAgICAg dGhlIEluc3BlY3RvckZyb250ZW5kQ2xpZW50IEFQSSBjb3VsZCBiZSBjbGVhbmVkIHVwIGEgYml0 LiBJIGhhZCB0bworICAgICAgICBsb29rIGF0IENocm9taXVtIHNvdXJjZSBjb2RlIHRvIGRldGVy bWluZSB0aGF0IEkgbmVlZGVkIHRvIGNhbGwgYmFjaworICAgICAgICBpbnRvIHRoZSBJbnNwZWN0 b3JGcm9udGVubmRBUEkgSlMgb2JqZWN0IGFmdGVyIHNhdmluZy9hcHBlbmRpbmcsIGFuZAorICAg ICAgICB0aGF0IEkgbmVlZGVkIHRvIGtlZXAgYSBtYXAgb2YgcGFzc2VkIFVSTHMgLT4gY2hvc2Vu IFVSTHMuKQorCisgICAgICAgICgtW1dlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXIgd2luZG93 OndpbGxQb3NpdGlvblNoZWV0OnVzaW5nUmVjdDpdKToKKyAgICAgICAgVHdlYWtlZCB0aGUgcG9z aXRpb24gb2YgdGhlIHNoZWV0IHNvIHRoYXQgb3Blbi9zYXZlIHNoZWV0cyBsb29rIGEKKyAgICAg ICAgbGl0dGxlIGJldHRlLnIKKworICAgICAgICAoLVtXZWJJbnNwZWN0b3JXaW5kb3dDb250cm9s bGVyIHdlYlZpZXc6cnVuT3BlblBhbmVsRm9yRmlsZUJ1dHRvbldpdGhSZXN1bHRMaXN0ZW5lcjph bGxvd011bHRpcGxlRmlsZXM6XSk6CisgICAgICAgIEltcGxlbWVudGVkIHRvIG1ha2UgbG9hZGlu ZyB0aW1lbGluZSBkYXRhIHdvcmsuCisKIDIwMTItMTItMjAgIElseWEgVGlraG9ub3Zza3kgIDxs b2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGZvciBj aHJvbWl1bSBtYWMgYWZ0ZXIgcjEzODIwNi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFj L1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmgKaW5kZXggY2IyZjkxN2ZlMmNhODY5 NjdkNzYyY2EyZmE0YmY5NTM4Njg3MTlmNi4uMmZlN2RjMGU0MTRjODU0YTFjZTU5NjNmMTc5YWIz NzhiMzI5N2YxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQv V2ViSW5zcGVjdG9yQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBv cnQvV2ViSW5zcGVjdG9yQ2xpZW50LmgKQEAgLTM3LDEwICszNywxMiBAQAogI2ltcG9ydCA8d3Rm L3RleHQvV1RGU3RyaW5nLmg+CiAKICNpZmRlZiBfX09CSkNfXworQGNsYXNzIE5TVVJMOwogQGNs YXNzIFdlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXI7CiBAY2xhc3MgV2ViTm9kZUhpZ2hsaWdo dGVyOwogQGNsYXNzIFdlYlZpZXc7CiAjZWxzZQorY2xhc3MgTlNVUkw7CiBjbGFzcyBXZWJJbnNw ZWN0b3JXaW5kb3dDb250cm9sbGVyOwogY2xhc3MgV2ViTm9kZUhpZ2hsaWdodGVyOwogY2xhc3Mg V2ViVmlldzsKQEAgLTExMCw3ICsxMTIsMTIgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICB2b2lk IHVwZGF0ZVdpbmRvd1RpdGxlKCkgY29uc3Q7CiAKKyAgICB2aXJ0dWFsIGJvb2wgY2FuU2F2ZSgp IE9WRVJSSURFIHsgcmV0dXJuIHRydWU7IH0KKyAgICB2aXJ0dWFsIHZvaWQgc2F2ZShjb25zdCBT dHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBjb250ZW50LCBib29sIGZvcmNlU2F2ZUFzKSBPVkVS UklERTsKKyAgICB2aXJ0dWFsIHZvaWQgYXBwZW5kKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBT dHJpbmcmIGNvbnRlbnQpIE9WRVJSSURFOworCiAgICAgV2ViVmlldyogbV9pbnNwZWN0ZWRXZWJW aWV3OwogICAgIFJldGFpblB0cjxXZWJJbnNwZWN0b3JXaW5kb3dDb250cm9sbGVyPiBtX3dpbmRv d0NvbnRyb2xsZXI7CiAgICAgU3RyaW5nIG1faW5zcGVjdGVkVVJMOworICAgIEhhc2hNYXA8U3Ry aW5nLCBSZXRhaW5QdHI8TlNVUkw+PiBtX3NhdmVVUkxzOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbSBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbQppbmRleCA1 MzM0ZjMyYzJhYzk5MmNhZTg2MWE4ZGJmMzUyY2ZiOTdmNTk2ZmNlLi5kNGRiZTNjZWZjMGQ5YTc2 YmUzNzlhMmZjM2E0NDNiNGI0NmJhM2QwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW0KKysrIGIvU291cmNlL1dlYktpdC9t YWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1tCkBAIC00MCw4ICs0MCwxMCBA QAogI2ltcG9ydCAiV2ViVUlEZWxlZ2F0ZS5oIgogI2ltcG9ydCAiV2ViUG9saWN5RGVsZWdhdGUu aCIKICNpbXBvcnQgIldlYlZpZXdJbnRlcm5hbC5oIgorI2ltcG9ydCA8V2ViQ29yZS9GcmFtZS5o PgogI2ltcG9ydCA8V2ViQ29yZS9JbnNwZWN0b3JDb250cm9sbGVyLmg+CiAjaW1wb3J0IDxXZWJD b3JlL1BhZ2UuaD4KKyNpbXBvcnQgPFdlYkNvcmUvU2NyaXB0VmFsdWUuaD4KICNpbXBvcnQgPFdl YkNvcmUvU29mdExpbmtpbmcuaD4KICNpbXBvcnQgPFdlYktpdC9ET01FeHRlbnNpb25zLmg+CiAj aW1wb3J0IDxXZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4KQEAgLTI5NCw2ICsyOTYsNDggQEAgdm9p ZCBXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6dXBkYXRlV2luZG93VGl0bGUoKSBjb25zdAog ICAgIFtbbV93aW5kb3dDb250cm9sbGVyLmdldCgpIHdpbmRvd10gc2V0VGl0bGU6dGl0bGVdOwog fQogCit2b2lkIFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50OjpzYXZlKGNvbnN0IFN0cmluZyYg cmVmVVJMLCBjb25zdCBTdHJpbmcmIHJlZkNvbnRlbnQsIGJvb2wgZm9yY2VTYXZlQXMpCit7Cisg ICAgU3RyaW5nIHVybCA9IHJlZlVSTDsKKyAgICBTdHJpbmcgY29udGVudCA9IHJlZkNvbnRlbnQ7 CisgICAgYXV0byBzYXZlVG9VUkwgPSBeKE5TVVJMICpVUkwpIHsKKyAgICAgICAgbV9zYXZlVVJM cy5zZXQodXJsLCBVUkwpOworCisgICAgICAgIFtjb250ZW50IHdyaXRlVG9VUkw6VVJMIGF0b21p Y2FsbHk6WUVTIGVuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nIGVycm9yOk5VTExdOworICAg ICAgICBjb3JlKFttX3dpbmRvd0NvbnRyb2xsZXIuZ2V0KCkgd2ViVmlld10pLT5tYWluRnJhbWUo KS0+c2NyaXB0KCktPmV4ZWN1dGVTY3JpcHQoW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJJ bnNwZWN0b3JGcm9udGVuZEFQSS5zYXZlZFVSTChcIiVAXCIpIiwgVVJMLmFic29sdXRlU3RyaW5n XSk7CisgICAgfTsKKworICAgIE5TVVJMICpVUkwgPSBbTlNVUkwgVVJMV2l0aFN0cmluZzp1cmxd OworICAgIGlmICghZm9yY2VTYXZlQXMpIHsKKyAgICAgICAgc2F2ZVRvVVJMKFVSTCk7CisgICAg ICAgIHJldHVybjsKKyAgICB9CisKKyAgICBOU1NhdmVQYW5lbCAqcGFuZWwgPSBbTlNTYXZlUGFu ZWwgc2F2ZVBhbmVsXTsKKyAgICBwYW5lbC5uYW1lRmllbGRTdHJpbmdWYWx1ZSA9IFVSTC5sYXN0 UGF0aENvbXBvbmVudDsKKyAgICBwYW5lbC5kaXJlY3RvcnlVUkwgPSBbVVJMIFVSTEJ5RGVsZXRp bmdMYXN0UGF0aENvbXBvbmVudF07CisKKyAgICBbcGFuZWwgYmVnaW5TaGVldE1vZGFsRm9yV2lu ZG93OlttX3dpbmRvd0NvbnRyb2xsZXIuZ2V0KCkgd2luZG93XSBjb21wbGV0aW9uSGFuZGxlcjpe KE5TSW50ZWdlciByZXN1bHQpIHsKKyAgICAgICAgaWYgKHJlc3VsdCA9PSBOU0ZpbGVIYW5kbGlu Z1BhbmVsQ2FuY2VsQnV0dG9uKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBBU1NFUlQo cmVzdWx0ID09IE5TRmlsZUhhbmRsaW5nUGFuZWxPS0J1dHRvbik7CisgICAgICAgIHNhdmVUb1VS TChwYW5lbC5VUkwpOworICAgIH1dOworfQorCit2b2lkIFdlYkluc3BlY3RvckZyb250ZW5kQ2xp ZW50OjphcHBlbmQoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgY29udGVudCkKK3sK KyAgICBSZXRhaW5QdHI8TlNVUkw+IFVSTCA9IG1fc2F2ZVVSTHMuZ2V0KHVybCk7CisgICAgaWYg KCFVUkwpCisgICAgICAgIFVSTCA9IFtOU1VSTCBVUkxXaXRoU3RyaW5nOnVybF07CisKKyAgICBO U0ZpbGVIYW5kbGUgKmhhbmRsZSA9IFtOU0ZpbGVIYW5kbGUgZmlsZUhhbmRsZUZvcldyaXRpbmdU b1VSTDpVUkwuZ2V0KCkgZXJyb3I6TlVMTF07CisgICAgW2hhbmRsZSBzZWVrVG9FbmRPZkZpbGVd OworICAgIFtoYW5kbGUgd3JpdGVEYXRhOltjb250ZW50IGRhdGFVc2luZ0VuY29kaW5nOk5TVVRG OFN0cmluZ0VuY29kaW5nXV07CisgICAgW2hhbmRsZSBjbG9zZUZpbGVdOworCisgICAgY29yZShb bV93aW5kb3dDb250cm9sbGVyLmdldCgpIHdlYlZpZXddKS0+bWFpbkZyYW1lKCktPnNjcmlwdCgp LT5leGVjdXRlU2NyaXB0KFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiSW5zcGVjdG9yRnJv bnRlbmRBUEkuYXBwZW5kZWRUb1VSTChcIiVAXCIpIiwgW1VSTCBhYnNvbHV0ZVN0cmluZ11dKTsK K30KIAogLy8gTUFSSzogLQogCkBAIC00MzYsNiArNDgwLDE0IEBAIHZvaWQgV2ViSW5zcGVjdG9y RnJvbnRlbmRDbGllbnQ6OnVwZGF0ZVdpbmRvd1RpdGxlKCkgY29uc3QKIAogLy8gTUFSSzogLQog CistIChOU1JlY3Qpd2luZG93OihOU1dpbmRvdyAqKXdpbmRvdyB3aWxsUG9zaXRpb25TaGVldDoo TlNXaW5kb3cgKilzaGVldCB1c2luZ1JlY3Q6KE5TUmVjdClyZWN0Cit7CisgICAgLy8gQXBwS2l0 IGRvZXNuJ3Qga25vdyBhYm91dCBvdXIgSFRNTCB0b29sYmFyLCBhbmQgcGxhY2VzIHRoZSBzaGVl dCBqdXN0IGEgbGl0dGxlIGJpdCB0b28gaGlnaC4KKyAgICAvLyBGSVhNRTogSXQgd291bGQgYmUg YmV0dGVyIHRvIGdldCB0aGUgaGVpZ2h0IG9mIHRoZSB0b29sYmFyIGFuZCB1c2UgaXQgaW4gdGhp cyBjYWxjdWxhdGlvbi4KKyAgICByZWN0Lm9yaWdpbi55IC09IDE7CisgICAgcmV0dXJuIHJlY3Q7 Cit9CisKIC0gKEJPT0wpd2luZG93U2hvdWxkQ2xvc2U6KGlkKXNlbmRlcgogewogICAgIFtzZWxm IGRlc3Ryb3lJbnNwZWN0b3JWaWV3OnRydWVdOwpAQCAtNjE2LDYgKzY2OCwyOSBAQCB2b2lkIFdl Ykluc3BlY3RvckZyb250ZW5kQ2xpZW50Ojp1cGRhdGVXaW5kb3dUaXRsZSgpIGNvbnN0CiAgICAg cmV0dXJuIFdlYkRyYWdEZXN0aW5hdGlvbkFjdGlvbk5vbmU7CiB9CiAKKy0gKHZvaWQpd2ViVmll dzooV2ViVmlldyAqKXNlbmRlciBydW5PcGVuUGFuZWxGb3JGaWxlQnV0dG9uV2l0aFJlc3VsdExp c3RlbmVyOihpZDxXZWJPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lcj4pcmVzdWx0TGlzdGVuZXIgYWxs b3dNdWx0aXBsZUZpbGVzOihCT09MKWFsbG93TXVsdGlwbGVGaWxlcworeworICAgIE5TT3BlblBh bmVsICpwYW5lbCA9IFtOU09wZW5QYW5lbCBvcGVuUGFuZWxdOworICAgIHBhbmVsLmNhbkNob29z ZURpcmVjdG9yaWVzID0gTk87CisgICAgcGFuZWwuY2FuQ2hvb3NlRmlsZXMgPSBZRVM7CisgICAg cGFuZWwuYWxsb3dzTXVsdGlwbGVTZWxlY3Rpb24gPSBhbGxvd011bHRpcGxlRmlsZXM7CisKKyAg ICBbcGFuZWwgYmVnaW5TaGVldE1vZGFsRm9yV2luZG93OnNlbGYud2luZG93IGNvbXBsZXRpb25I YW5kbGVyOl4oTlNJbnRlZ2VyIHJlc3VsdCkgeworICAgICAgICBpZiAocmVzdWx0ID09IE5TRmls ZUhhbmRsaW5nUGFuZWxDYW5jZWxCdXR0b24pIHsKKyAgICAgICAgICAgIFtyZXN1bHRMaXN0ZW5l ciBjYW5jZWxdOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIEFTU0VS VChyZXN1bHQgPT0gTlNGaWxlSGFuZGxpbmdQYW5lbE9LQnV0dG9uKTsKKworICAgICAgICBOU0Fy cmF5ICpVUkxzID0gcGFuZWwuVVJMczsKKyAgICAgICAgTlNNdXRhYmxlQXJyYXkgKmZpbGVuYW1l cyA9IFtOU011dGFibGVBcnJheSBhcnJheVdpdGhDYXBhY2l0eTpVUkxzLmNvdW50XTsKKyAgICAg ICAgZm9yIChOU1VSTCAqVVJMIGluIFVSTHMpIHsKKyAgICAgICAgICAgIFtmaWxlbmFtZXMgYWRk T2JqZWN0OlVSTC5wYXRoXTsKKyAgICAgICAgfQorICAgICAgICBbcmVzdWx0TGlzdGVuZXIgY2hv b3NlRmlsZW5hbWVzOmZpbGVuYW1lc107CisgICAgfV07Cit9CisKIC8vIE1BUks6IC0KIC8vIE1B Uks6IFBvbGljeSBkZWxlZ2F0ZQogCg== 180358 2012-12-20 10:03:18 -0800 2012-12-20 10:04:10 -0800 Patch bug-105547-20121220130033.patch text/plain 6844 aroben U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4MjU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggODNmZjAxMzY2 ZWY5OWYyZTU3MGM5MTIyZDM3NjViNzZmOTA5ZjJiNi4uZTQwNDlkMWNmYzg0YWEwYjQ4NjkwZDM0 ODBlNGZjY2U5NDg5YWM1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEy LTEyLTIwICBBZGFtIFJvYmVuICA8YXJvYmVuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogTWFjIFdLMSBJbnNwZWN0b3IgY2FuJ3Qgc2F2ZS9sb2FkIHRpbWVsaW5lIGRhdGEK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTU0Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29y ZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lmg6IERlY2xhcmVkIG5ldyBvdmVycmlkZXMgYW5k CisgICAgICAgIG1lbWJlciB2YXJpYWJsZXMgbmVjZXNzYXJ5IGZvciBzYXZlIHN1cHBvcnQuCisK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW06CisgICAgICAg IChXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6c2F2ZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3JGcm9udGVuZENsaWVudDo6YXBwZW5kKToKKyAgICAgICAgSW1wbGVtZW50ZWQgdGhlc2UgdG8g bWFrZSBzYXZpbmcgdGltZWxpbmUgZGF0YSB3b3JrLiAoSXQgc2VlbXMgdG8gbWUKKyAgICAgICAg dGhlIEluc3BlY3RvckZyb250ZW5kQ2xpZW50IEFQSSBjb3VsZCBiZSBjbGVhbmVkIHVwIGEgYml0 LiBJIGhhZCB0bworICAgICAgICBsb29rIGF0IENocm9taXVtIHNvdXJjZSBjb2RlIHRvIGRldGVy bWluZSB0aGF0IEkgbmVlZGVkIHRvIGNhbGwgYmFjaworICAgICAgICBpbnRvIHRoZSBJbnNwZWN0 b3JGcm9udGVubmRBUEkgSlMgb2JqZWN0IGFmdGVyIHNhdmluZy9hcHBlbmRpbmcsIGFuZAorICAg ICAgICB0aGF0IEkgbmVlZGVkIHRvIGtlZXAgYSBtYXAgb2YgcGFzc2VkIFVSTHMgLT4gY2hvc2Vu IFVSTHMuKQorCisgICAgICAgICgtW1dlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXIgd2luZG93 OndpbGxQb3NpdGlvblNoZWV0OnVzaW5nUmVjdDpdKToKKyAgICAgICAgVHdlYWtlZCB0aGUgcG9z aXRpb24gb2YgdGhlIHNoZWV0IHNvIHRoYXQgb3Blbi9zYXZlIHNoZWV0cyBsb29rIGEKKyAgICAg ICAgbGl0dGxlIGJldHRlLnIKKworICAgICAgICAoLVtXZWJJbnNwZWN0b3JXaW5kb3dDb250cm9s bGVyIHdlYlZpZXc6cnVuT3BlblBhbmVsRm9yRmlsZUJ1dHRvbldpdGhSZXN1bHRMaXN0ZW5lcjph bGxvd011bHRpcGxlRmlsZXM6XSk6CisgICAgICAgIEltcGxlbWVudGVkIHRvIG1ha2UgbG9hZGlu ZyB0aW1lbGluZSBkYXRhIHdvcmsuCisKIDIwMTItMTItMjAgIElseWEgVGlraG9ub3Zza3kgIDxs b2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGZvciBj aHJvbWl1bSBtYWMgYWZ0ZXIgcjEzODIwNi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFj L1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmgKaW5kZXggY2IyZjkxN2ZlMmNhODY5 NjdkNzYyY2EyZmE0YmY5NTM4Njg3MTlmNi4uMmZlN2RjMGU0MTRjODU0YTFjZTU5NjNmMTc5YWIz NzhiMzI5N2YxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQv V2ViSW5zcGVjdG9yQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBv cnQvV2ViSW5zcGVjdG9yQ2xpZW50LmgKQEAgLTM3LDEwICszNywxMiBAQAogI2ltcG9ydCA8d3Rm L3RleHQvV1RGU3RyaW5nLmg+CiAKICNpZmRlZiBfX09CSkNfXworQGNsYXNzIE5TVVJMOwogQGNs YXNzIFdlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXI7CiBAY2xhc3MgV2ViTm9kZUhpZ2hsaWdo dGVyOwogQGNsYXNzIFdlYlZpZXc7CiAjZWxzZQorY2xhc3MgTlNVUkw7CiBjbGFzcyBXZWJJbnNw ZWN0b3JXaW5kb3dDb250cm9sbGVyOwogY2xhc3MgV2ViTm9kZUhpZ2hsaWdodGVyOwogY2xhc3Mg V2ViVmlldzsKQEAgLTExMCw3ICsxMTIsMTIgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICB2b2lk IHVwZGF0ZVdpbmRvd1RpdGxlKCkgY29uc3Q7CiAKKyAgICB2aXJ0dWFsIGJvb2wgY2FuU2F2ZSgp IE9WRVJSSURFIHsgcmV0dXJuIHRydWU7IH0KKyAgICB2aXJ0dWFsIHZvaWQgc2F2ZShjb25zdCBT dHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBjb250ZW50LCBib29sIGZvcmNlU2F2ZUFzKSBPVkVS UklERTsKKyAgICB2aXJ0dWFsIHZvaWQgYXBwZW5kKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBT dHJpbmcmIGNvbnRlbnQpIE9WRVJSSURFOworCiAgICAgV2ViVmlldyogbV9pbnNwZWN0ZWRXZWJW aWV3OwogICAgIFJldGFpblB0cjxXZWJJbnNwZWN0b3JXaW5kb3dDb250cm9sbGVyPiBtX3dpbmRv d0NvbnRyb2xsZXI7CiAgICAgU3RyaW5nIG1faW5zcGVjdGVkVVJMOworICAgIEhhc2hNYXA8U3Ry aW5nLCBSZXRhaW5QdHI8TlNVUkw+PiBtX3NhdmVVUkxzOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbSBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbQppbmRleCA1 MzM0ZjMyYzJhYzk5MmNhZTg2MWE4ZGJmMzUyY2ZiOTdmNTk2ZmNlLi40ZDNiNzYyNWIzNTlmYzVj MDg3ZjJlMTQxOGFiZjRiZTYxZDkzMzk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW0KKysrIGIvU291cmNlL1dlYktpdC9t YWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1tCkBAIC00MCw4ICs0MCwxMCBA QAogI2ltcG9ydCAiV2ViVUlEZWxlZ2F0ZS5oIgogI2ltcG9ydCAiV2ViUG9saWN5RGVsZWdhdGUu aCIKICNpbXBvcnQgIldlYlZpZXdJbnRlcm5hbC5oIgorI2ltcG9ydCA8V2ViQ29yZS9GcmFtZS5o PgogI2ltcG9ydCA8V2ViQ29yZS9JbnNwZWN0b3JDb250cm9sbGVyLmg+CiAjaW1wb3J0IDxXZWJD b3JlL1BhZ2UuaD4KKyNpbXBvcnQgPFdlYkNvcmUvU2NyaXB0VmFsdWUuaD4KICNpbXBvcnQgPFdl YkNvcmUvU29mdExpbmtpbmcuaD4KICNpbXBvcnQgPFdlYktpdC9ET01FeHRlbnNpb25zLmg+CiAj aW1wb3J0IDxXZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4KQEAgLTI5NCw2ICsyOTYsNDggQEAgdm9p ZCBXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6dXBkYXRlV2luZG93VGl0bGUoKSBjb25zdAog ICAgIFtbbV93aW5kb3dDb250cm9sbGVyLmdldCgpIHdpbmRvd10gc2V0VGl0bGU6dGl0bGVdOwog fQogCit2b2lkIFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50OjpzYXZlKGNvbnN0IFN0cmluZyYg cmVmVVJMLCBjb25zdCBTdHJpbmcmIHJlZkNvbnRlbnQsIGJvb2wgZm9yY2VTYXZlQXMpCit7Cisg ICAgU3RyaW5nIHVybCA9IHJlZlVSTDsKKyAgICBTdHJpbmcgY29udGVudCA9IHJlZkNvbnRlbnQ7 CisgICAgYXV0byBzYXZlVG9VUkwgPSBeKE5TVVJMICpVUkwpIHsKKyAgICAgICAgbV9zYXZlVVJM cy5zZXQodXJsLCBVUkwpOworCisgICAgICAgIFtjb250ZW50IHdyaXRlVG9VUkw6VVJMIGF0b21p Y2FsbHk6WUVTIGVuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nIGVycm9yOk5VTExdOworICAg ICAgICBjb3JlKFttX3dpbmRvd0NvbnRyb2xsZXIgd2ViVmlld10pLT5tYWluRnJhbWUoKS0+c2Ny aXB0KCktPmV4ZWN1dGVTY3JpcHQoW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJJbnNwZWN0 b3JGcm9udGVuZEFQSS5zYXZlZFVSTChcIiVAXCIpIiwgVVJMLmFic29sdXRlU3RyaW5nXSk7Cisg ICAgfTsKKworICAgIE5TVVJMICpVUkwgPSBbTlNVUkwgVVJMV2l0aFN0cmluZzp1cmxdOworICAg IGlmICghZm9yY2VTYXZlQXMpIHsKKyAgICAgICAgc2F2ZVRvVVJMKFVSTCk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisKKyAgICBOU1NhdmVQYW5lbCAqcGFuZWwgPSBbTlNTYXZlUGFuZWwgc2F2 ZVBhbmVsXTsKKyAgICBwYW5lbC5uYW1lRmllbGRTdHJpbmdWYWx1ZSA9IFVSTC5sYXN0UGF0aENv bXBvbmVudDsKKyAgICBwYW5lbC5kaXJlY3RvcnlVUkwgPSBbVVJMIFVSTEJ5RGVsZXRpbmdMYXN0 UGF0aENvbXBvbmVudF07CisKKyAgICBbcGFuZWwgYmVnaW5TaGVldE1vZGFsRm9yV2luZG93Oltt X3dpbmRvd0NvbnRyb2xsZXIgd2luZG93XSBjb21wbGV0aW9uSGFuZGxlcjpeKE5TSW50ZWdlciBy ZXN1bHQpIHsKKyAgICAgICAgaWYgKHJlc3VsdCA9PSBOU0ZpbGVIYW5kbGluZ1BhbmVsQ2FuY2Vs QnV0dG9uKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBBU1NFUlQocmVzdWx0ID09IE5T RmlsZUhhbmRsaW5nUGFuZWxPS0J1dHRvbik7CisgICAgICAgIHNhdmVUb1VSTChwYW5lbC5VUkwp OworICAgIH1dOworfQorCit2b2lkIFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50OjphcHBlbmQo Y29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgY29udGVudCkKK3sKKyAgICBSZXRhaW5Q dHI8TlNVUkw+IFVSTCA9IG1fc2F2ZVVSTHMuZ2V0KHVybCk7CisgICAgaWYgKCFVUkwpCisgICAg ICAgIFVSTCA9IFtOU1VSTCBVUkxXaXRoU3RyaW5nOnVybF07CisKKyAgICBOU0ZpbGVIYW5kbGUg KmhhbmRsZSA9IFtOU0ZpbGVIYW5kbGUgZmlsZUhhbmRsZUZvcldyaXRpbmdUb1VSTDpVUkwuZ2V0 KCkgZXJyb3I6TlVMTF07CisgICAgW2hhbmRsZSBzZWVrVG9FbmRPZkZpbGVdOworICAgIFtoYW5k bGUgd3JpdGVEYXRhOltjb250ZW50IGRhdGFVc2luZ0VuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29k aW5nXV07CisgICAgW2hhbmRsZSBjbG9zZUZpbGVdOworCisgICAgY29yZShbbV93aW5kb3dDb250 cm9sbGVyIHdlYlZpZXddKS0+bWFpbkZyYW1lKCktPnNjcmlwdCgpLT5leGVjdXRlU2NyaXB0KFtO U1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiSW5zcGVjdG9yRnJvbnRlbmRBUEkuYXBwZW5kZWRU b1VSTChcIiVAXCIpIiwgW1VSTCBhYnNvbHV0ZVN0cmluZ11dKTsKK30KIAogLy8gTUFSSzogLQog CkBAIC00MzYsNiArNDgwLDE0IEBAIHZvaWQgV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OnVw ZGF0ZVdpbmRvd1RpdGxlKCkgY29uc3QKIAogLy8gTUFSSzogLQogCistIChOU1JlY3Qpd2luZG93 OihOU1dpbmRvdyAqKXdpbmRvdyB3aWxsUG9zaXRpb25TaGVldDooTlNXaW5kb3cgKilzaGVldCB1 c2luZ1JlY3Q6KE5TUmVjdClyZWN0Cit7CisgICAgLy8gQXBwS2l0IGRvZXNuJ3Qga25vdyBhYm91 dCBvdXIgSFRNTCB0b29sYmFyLCBhbmQgcGxhY2VzIHRoZSBzaGVldCBqdXN0IGEgbGl0dGxlIGJp dCB0b28gaGlnaC4KKyAgICAvLyBGSVhNRTogSXQgd291bGQgYmUgYmV0dGVyIHRvIGdldCB0aGUg aGVpZ2h0IG9mIHRoZSB0b29sYmFyIGFuZCB1c2UgaXQgaW4gdGhpcyBjYWxjdWxhdGlvbi4KKyAg ICByZWN0Lm9yaWdpbi55IC09IDE7CisgICAgcmV0dXJuIHJlY3Q7Cit9CisKIC0gKEJPT0wpd2lu ZG93U2hvdWxkQ2xvc2U6KGlkKXNlbmRlcgogewogICAgIFtzZWxmIGRlc3Ryb3lJbnNwZWN0b3JW aWV3OnRydWVdOwpAQCAtNjE2LDYgKzY2OCwyOSBAQCB2b2lkIFdlYkluc3BlY3RvckZyb250ZW5k Q2xpZW50Ojp1cGRhdGVXaW5kb3dUaXRsZSgpIGNvbnN0CiAgICAgcmV0dXJuIFdlYkRyYWdEZXN0 aW5hdGlvbkFjdGlvbk5vbmU7CiB9CiAKKy0gKHZvaWQpd2ViVmlldzooV2ViVmlldyAqKXNlbmRl ciBydW5PcGVuUGFuZWxGb3JGaWxlQnV0dG9uV2l0aFJlc3VsdExpc3RlbmVyOihpZDxXZWJPcGVu UGFuZWxSZXN1bHRMaXN0ZW5lcj4pcmVzdWx0TGlzdGVuZXIgYWxsb3dNdWx0aXBsZUZpbGVzOihC T09MKWFsbG93TXVsdGlwbGVGaWxlcworeworICAgIE5TT3BlblBhbmVsICpwYW5lbCA9IFtOU09w ZW5QYW5lbCBvcGVuUGFuZWxdOworICAgIHBhbmVsLmNhbkNob29zZURpcmVjdG9yaWVzID0gTk87 CisgICAgcGFuZWwuY2FuQ2hvb3NlRmlsZXMgPSBZRVM7CisgICAgcGFuZWwuYWxsb3dzTXVsdGlw bGVTZWxlY3Rpb24gPSBhbGxvd011bHRpcGxlRmlsZXM7CisKKyAgICBbcGFuZWwgYmVnaW5TaGVl dE1vZGFsRm9yV2luZG93OnNlbGYud2luZG93IGNvbXBsZXRpb25IYW5kbGVyOl4oTlNJbnRlZ2Vy IHJlc3VsdCkgeworICAgICAgICBpZiAocmVzdWx0ID09IE5TRmlsZUhhbmRsaW5nUGFuZWxDYW5j ZWxCdXR0b24pIHsKKyAgICAgICAgICAgIFtyZXN1bHRMaXN0ZW5lciBjYW5jZWxdOworICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIEFTU0VSVChyZXN1bHQgPT0gTlNGaWxl SGFuZGxpbmdQYW5lbE9LQnV0dG9uKTsKKworICAgICAgICBOU0FycmF5ICpVUkxzID0gcGFuZWwu VVJMczsKKyAgICAgICAgTlNNdXRhYmxlQXJyYXkgKmZpbGVuYW1lcyA9IFtOU011dGFibGVBcnJh eSBhcnJheVdpdGhDYXBhY2l0eTpVUkxzLmNvdW50XTsKKyAgICAgICAgZm9yIChOU1VSTCAqVVJM IGluIFVSTHMpIHsKKyAgICAgICAgICAgIFtmaWxlbmFtZXMgYWRkT2JqZWN0OlVSTC5wYXRoXTsK KyAgICAgICAgfQorICAgICAgICBbcmVzdWx0TGlzdGVuZXIgY2hvb3NlRmlsZW5hbWVzOmZpbGVu YW1lc107CisgICAgfV07Cit9CisKIC8vIE1BUks6IC0KIC8vIE1BUks6IFBvbGljeSBkZWxlZ2F0 ZQogCg== 180359 2012-12-20 10:04:14 -0800 2012-12-20 11:03:38 -0800 Patch bug-105547-20121220130130.patch text/plain 6843 aroben U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4MjU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggODNmZjAxMzY2 ZWY5OWYyZTU3MGM5MTIyZDM3NjViNzZmOTA5ZjJiNi4uNjQxOWVhMmUyOTEyNjI2NDhkMjFkNWNm MDA5OTRjNzgwMTI2MjdiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEy LTEyLTIwICBBZGFtIFJvYmVuICA8YXJvYmVuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogTWFjIFdLMSBJbnNwZWN0b3IgY2FuJ3Qgc2F2ZS9sb2FkIHRpbWVsaW5lIGRhdGEK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTU0Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29y ZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lmg6IERlY2xhcmVkIG5ldyBvdmVycmlkZXMgYW5k CisgICAgICAgIG1lbWJlciB2YXJpYWJsZXMgbmVjZXNzYXJ5IGZvciBzYXZlIHN1cHBvcnQuCisK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW06CisgICAgICAg IChXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6c2F2ZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3JGcm9udGVuZENsaWVudDo6YXBwZW5kKToKKyAgICAgICAgSW1wbGVtZW50ZWQgdGhlc2UgdG8g bWFrZSBzYXZpbmcgdGltZWxpbmUgZGF0YSB3b3JrLiAoSXQgc2VlbXMgdG8gbWUKKyAgICAgICAg dGhlIEluc3BlY3RvckZyb250ZW5kQ2xpZW50IEFQSSBjb3VsZCBiZSBjbGVhbmVkIHVwIGEgYml0 LiBJIGhhZCB0bworICAgICAgICBsb29rIGF0IENocm9taXVtIHNvdXJjZSBjb2RlIHRvIGRldGVy bWluZSB0aGF0IEkgbmVlZGVkIHRvIGNhbGwgYmFjaworICAgICAgICBpbnRvIHRoZSBJbnNwZWN0 b3JGcm9udGVuZEFQSSBKUyBvYmplY3QgYWZ0ZXIgc2F2aW5nL2FwcGVuZGluZywgYW5kCisgICAg ICAgIHRoYXQgSSBuZWVkZWQgdG8ga2VlcCBhIG1hcCBvZiBwYXNzZWQgVVJMcyAtPiBjaG9zZW4g VVJMcy4pCisKKyAgICAgICAgKC1bV2ViSW5zcGVjdG9yV2luZG93Q29udHJvbGxlciB3aW5kb3c6 d2lsbFBvc2l0aW9uU2hlZXQ6dXNpbmdSZWN0Ol0pOgorICAgICAgICBUd2Vha2VkIHRoZSBwb3Np dGlvbiBvZiB0aGUgc2hlZXQgc28gdGhhdCBvcGVuL3NhdmUgc2hlZXRzIGxvb2sgYQorICAgICAg ICBsaXR0bGUgYmV0dGUucgorCisgICAgICAgICgtW1dlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xs ZXIgd2ViVmlldzpydW5PcGVuUGFuZWxGb3JGaWxlQnV0dG9uV2l0aFJlc3VsdExpc3RlbmVyOmFs bG93TXVsdGlwbGVGaWxlczpdKToKKyAgICAgICAgSW1wbGVtZW50ZWQgdG8gbWFrZSBsb2FkaW5n IHRpbWVsaW5lIGRhdGEgd29yay4KKwogMjAxMi0xMi0yMCAgSWx5YSBUaWtob25vdnNreSAgPGxv aXNsb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXggZm9yIGNo cm9taXVtIG1hYyBhZnRlciByMTM4MjA2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuaAppbmRleCBjYjJmOTE3ZmUyY2E4Njk2 N2Q3NjJjYTJmYTRiZjk1Mzg2ODcxOWY2Li4yZmU3ZGMwZTQxNGM4NTRhMWNlNTk2M2YxNzlhYjM3 OGIzMjk3ZjE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9X ZWJJbnNwZWN0b3JDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9y dC9XZWJJbnNwZWN0b3JDbGllbnQuaApAQCAtMzcsMTAgKzM3LDEyIEBACiAjaW1wb3J0IDx3dGYv dGV4dC9XVEZTdHJpbmcuaD4KIAogI2lmZGVmIF9fT0JKQ19fCitAY2xhc3MgTlNVUkw7CiBAY2xh c3MgV2ViSW5zcGVjdG9yV2luZG93Q29udHJvbGxlcjsKIEBjbGFzcyBXZWJOb2RlSGlnaGxpZ2h0 ZXI7CiBAY2xhc3MgV2ViVmlldzsKICNlbHNlCitjbGFzcyBOU1VSTDsKIGNsYXNzIFdlYkluc3Bl Y3RvcldpbmRvd0NvbnRyb2xsZXI7CiBjbGFzcyBXZWJOb2RlSGlnaGxpZ2h0ZXI7CiBjbGFzcyBX ZWJWaWV3OwpAQCAtMTEwLDcgKzExMiwxMiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHZvaWQg dXBkYXRlV2luZG93VGl0bGUoKSBjb25zdDsKIAorICAgIHZpcnR1YWwgYm9vbCBjYW5TYXZlKCkg T1ZFUlJJREUgeyByZXR1cm4gdHJ1ZTsgfQorICAgIHZpcnR1YWwgdm9pZCBzYXZlKGNvbnN0IFN0 cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGNvbnRlbnQsIGJvb2wgZm9yY2VTYXZlQXMpIE9WRVJS SURFOworICAgIHZpcnR1YWwgdm9pZCBhcHBlbmQoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0 cmluZyYgY29udGVudCkgT1ZFUlJJREU7CisKICAgICBXZWJWaWV3KiBtX2luc3BlY3RlZFdlYlZp ZXc7CiAgICAgUmV0YWluUHRyPFdlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXI+IG1fd2luZG93 Q29udHJvbGxlcjsKICAgICBTdHJpbmcgbV9pbnNwZWN0ZWRVUkw7CisgICAgSGFzaE1hcDxTdHJp bmcsIFJldGFpblB0cjxOU1VSTD4+IG1fc2F2ZVVSTHM7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1tIGIvU291cmNl L1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1tCmluZGV4IDUz MzRmMzJjMmFjOTkyY2FlODYxYThkYmYzNTJjZmI5N2Y1OTZmY2UuLjRkM2I3NjI1YjM1OWZjNWMw ODdmMmUxNDE4YWJmNGJlNjFkOTMzOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dl YkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW0KQEAgLTQwLDggKzQwLDEwIEBA CiAjaW1wb3J0ICJXZWJVSURlbGVnYXRlLmgiCiAjaW1wb3J0ICJXZWJQb2xpY3lEZWxlZ2F0ZS5o IgogI2ltcG9ydCAiV2ViVmlld0ludGVybmFsLmgiCisjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lLmg+ CiAjaW1wb3J0IDxXZWJDb3JlL0luc3BlY3RvckNvbnRyb2xsZXIuaD4KICNpbXBvcnQgPFdlYkNv cmUvUGFnZS5oPgorI2ltcG9ydCA8V2ViQ29yZS9TY3JpcHRWYWx1ZS5oPgogI2ltcG9ydCA8V2Vi Q29yZS9Tb2Z0TGlua2luZy5oPgogI2ltcG9ydCA8V2ViS2l0L0RPTUV4dGVuc2lvbnMuaD4KICNp bXBvcnQgPFdlYktpdFN5c3RlbUludGVyZmFjZS5oPgpAQCAtMjk0LDYgKzI5Niw0OCBAQCB2b2lk IFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50Ojp1cGRhdGVXaW5kb3dUaXRsZSgpIGNvbnN0CiAg ICAgW1ttX3dpbmRvd0NvbnRyb2xsZXIuZ2V0KCkgd2luZG93XSBzZXRUaXRsZTp0aXRsZV07CiB9 CiAKK3ZvaWQgV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OnNhdmUoY29uc3QgU3RyaW5nJiBy ZWZVUkwsIGNvbnN0IFN0cmluZyYgcmVmQ29udGVudCwgYm9vbCBmb3JjZVNhdmVBcykKK3sKKyAg ICBTdHJpbmcgdXJsID0gcmVmVVJMOworICAgIFN0cmluZyBjb250ZW50ID0gcmVmQ29udGVudDsK KyAgICBhdXRvIHNhdmVUb1VSTCA9IF4oTlNVUkwgKlVSTCkgeworICAgICAgICBtX3NhdmVVUkxz LnNldCh1cmwsIFVSTCk7CisKKyAgICAgICAgW2NvbnRlbnQgd3JpdGVUb1VSTDpVUkwgYXRvbWlj YWxseTpZRVMgZW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmcgZXJyb3I6TlVMTF07CisgICAg ICAgIGNvcmUoW21fd2luZG93Q29udHJvbGxlciB3ZWJWaWV3XSktPm1haW5GcmFtZSgpLT5zY3Jp cHQoKS0+ZXhlY3V0ZVNjcmlwdChbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIkluc3BlY3Rv ckZyb250ZW5kQVBJLnNhdmVkVVJMKFwiJUBcIikiLCBVUkwuYWJzb2x1dGVTdHJpbmddKTsKKyAg ICB9OworCisgICAgTlNVUkwgKlVSTCA9IFtOU1VSTCBVUkxXaXRoU3RyaW5nOnVybF07CisgICAg aWYgKCFmb3JjZVNhdmVBcykgeworICAgICAgICBzYXZlVG9VUkwoVVJMKTsKKyAgICAgICAgcmV0 dXJuOworICAgIH0KKworICAgIE5TU2F2ZVBhbmVsICpwYW5lbCA9IFtOU1NhdmVQYW5lbCBzYXZl UGFuZWxdOworICAgIHBhbmVsLm5hbWVGaWVsZFN0cmluZ1ZhbHVlID0gVVJMLmxhc3RQYXRoQ29t cG9uZW50OworICAgIHBhbmVsLmRpcmVjdG9yeVVSTCA9IFtVUkwgVVJMQnlEZWxldGluZ0xhc3RQ YXRoQ29tcG9uZW50XTsKKworICAgIFtwYW5lbCBiZWdpblNoZWV0TW9kYWxGb3JXaW5kb3c6W21f d2luZG93Q29udHJvbGxlciB3aW5kb3ddIGNvbXBsZXRpb25IYW5kbGVyOl4oTlNJbnRlZ2VyIHJl c3VsdCkgeworICAgICAgICBpZiAocmVzdWx0ID09IE5TRmlsZUhhbmRsaW5nUGFuZWxDYW5jZWxC dXR0b24pCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIEFTU0VSVChyZXN1bHQgPT0gTlNG aWxlSGFuZGxpbmdQYW5lbE9LQnV0dG9uKTsKKyAgICAgICAgc2F2ZVRvVVJMKHBhbmVsLlVSTCk7 CisgICAgfV07Cit9CisKK3ZvaWQgV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OmFwcGVuZChj b25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBjb250ZW50KQoreworICAgIFJldGFpblB0 cjxOU1VSTD4gVVJMID0gbV9zYXZlVVJMcy5nZXQodXJsKTsKKyAgICBpZiAoIVVSTCkKKyAgICAg ICAgVVJMID0gW05TVVJMIFVSTFdpdGhTdHJpbmc6dXJsXTsKKworICAgIE5TRmlsZUhhbmRsZSAq aGFuZGxlID0gW05TRmlsZUhhbmRsZSBmaWxlSGFuZGxlRm9yV3JpdGluZ1RvVVJMOlVSTC5nZXQo KSBlcnJvcjpOVUxMXTsKKyAgICBbaGFuZGxlIHNlZWtUb0VuZE9mRmlsZV07CisgICAgW2hhbmRs ZSB3cml0ZURhdGE6W2NvbnRlbnQgZGF0YVVzaW5nRW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2Rp bmddXTsKKyAgICBbaGFuZGxlIGNsb3NlRmlsZV07CisKKyAgICBjb3JlKFttX3dpbmRvd0NvbnRy b2xsZXIgd2ViVmlld10pLT5tYWluRnJhbWUoKS0+c2NyaXB0KCktPmV4ZWN1dGVTY3JpcHQoW05T U3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJJbnNwZWN0b3JGcm9udGVuZEFQSS5hcHBlbmRlZFRv VVJMKFwiJUBcIikiLCBbVVJMIGFic29sdXRlU3RyaW5nXV0pOworfQogCiAvLyBNQVJLOiAtCiAK QEAgLTQzNiw2ICs0ODAsMTQgQEAgdm9pZCBXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6dXBk YXRlV2luZG93VGl0bGUoKSBjb25zdAogCiAvLyBNQVJLOiAtCiAKKy0gKE5TUmVjdCl3aW5kb3c6 KE5TV2luZG93ICopd2luZG93IHdpbGxQb3NpdGlvblNoZWV0OihOU1dpbmRvdyAqKXNoZWV0IHVz aW5nUmVjdDooTlNSZWN0KXJlY3QKK3sKKyAgICAvLyBBcHBLaXQgZG9lc24ndCBrbm93IGFib3V0 IG91ciBIVE1MIHRvb2xiYXIsIGFuZCBwbGFjZXMgdGhlIHNoZWV0IGp1c3QgYSBsaXR0bGUgYml0 IHRvbyBoaWdoLgorICAgIC8vIEZJWE1FOiBJdCB3b3VsZCBiZSBiZXR0ZXIgdG8gZ2V0IHRoZSBo ZWlnaHQgb2YgdGhlIHRvb2xiYXIgYW5kIHVzZSBpdCBpbiB0aGlzIGNhbGN1bGF0aW9uLgorICAg IHJlY3Qub3JpZ2luLnkgLT0gMTsKKyAgICByZXR1cm4gcmVjdDsKK30KKwogLSAoQk9PTCl3aW5k b3dTaG91bGRDbG9zZTooaWQpc2VuZGVyCiB7CiAgICAgW3NlbGYgZGVzdHJveUluc3BlY3RvclZp ZXc6dHJ1ZV07CkBAIC02MTYsNiArNjY4LDI5IEBAIHZvaWQgV2ViSW5zcGVjdG9yRnJvbnRlbmRD bGllbnQ6OnVwZGF0ZVdpbmRvd1RpdGxlKCkgY29uc3QKICAgICByZXR1cm4gV2ViRHJhZ0Rlc3Rp bmF0aW9uQWN0aW9uTm9uZTsKIH0KIAorLSAodm9pZCl3ZWJWaWV3OihXZWJWaWV3ICopc2VuZGVy IHJ1bk9wZW5QYW5lbEZvckZpbGVCdXR0b25XaXRoUmVzdWx0TGlzdGVuZXI6KGlkPFdlYk9wZW5Q YW5lbFJlc3VsdExpc3RlbmVyPilyZXN1bHRMaXN0ZW5lciBhbGxvd011bHRpcGxlRmlsZXM6KEJP T0wpYWxsb3dNdWx0aXBsZUZpbGVzCit7CisgICAgTlNPcGVuUGFuZWwgKnBhbmVsID0gW05TT3Bl blBhbmVsIG9wZW5QYW5lbF07CisgICAgcGFuZWwuY2FuQ2hvb3NlRGlyZWN0b3JpZXMgPSBOTzsK KyAgICBwYW5lbC5jYW5DaG9vc2VGaWxlcyA9IFlFUzsKKyAgICBwYW5lbC5hbGxvd3NNdWx0aXBs ZVNlbGVjdGlvbiA9IGFsbG93TXVsdGlwbGVGaWxlczsKKworICAgIFtwYW5lbCBiZWdpblNoZWV0 TW9kYWxGb3JXaW5kb3c6c2VsZi53aW5kb3cgY29tcGxldGlvbkhhbmRsZXI6XihOU0ludGVnZXIg cmVzdWx0KSB7CisgICAgICAgIGlmIChyZXN1bHQgPT0gTlNGaWxlSGFuZGxpbmdQYW5lbENhbmNl bEJ1dHRvbikgeworICAgICAgICAgICAgW3Jlc3VsdExpc3RlbmVyIGNhbmNlbF07CisgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgQVNTRVJUKHJlc3VsdCA9PSBOU0ZpbGVI YW5kbGluZ1BhbmVsT0tCdXR0b24pOworCisgICAgICAgIE5TQXJyYXkgKlVSTHMgPSBwYW5lbC5V UkxzOworICAgICAgICBOU011dGFibGVBcnJheSAqZmlsZW5hbWVzID0gW05TTXV0YWJsZUFycmF5 IGFycmF5V2l0aENhcGFjaXR5OlVSTHMuY291bnRdOworICAgICAgICBmb3IgKE5TVVJMICpVUkwg aW4gVVJMcykgeworICAgICAgICAgICAgW2ZpbGVuYW1lcyBhZGRPYmplY3Q6VVJMLnBhdGhdOwor ICAgICAgICB9CisgICAgICAgIFtyZXN1bHRMaXN0ZW5lciBjaG9vc2VGaWxlbmFtZXM6ZmlsZW5h bWVzXTsKKyAgICB9XTsKK30KKwogLy8gTUFSSzogLQogLy8gTUFSSzogUG9saWN5IGRlbGVnYXRl CiAK 180370 2012-12-20 11:03:42 -0800 2012-12-20 13:26:06 -0800 Patch bug-105547-20121220140056.patch text/plain 6905 aroben U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4MjU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggODNmZjAxMzY2 ZWY5OWYyZTU3MGM5MTIyZDM3NjViNzZmOTA5ZjJiNi4uNjQxOWVhMmUyOTEyNjI2NDhkMjFkNWNm MDA5OTRjNzgwMTI2MjdiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEy LTEyLTIwICBBZGFtIFJvYmVuICA8YXJvYmVuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogTWFjIFdLMSBJbnNwZWN0b3IgY2FuJ3Qgc2F2ZS9sb2FkIHRpbWVsaW5lIGRhdGEK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTU0Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29y ZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lmg6IERlY2xhcmVkIG5ldyBvdmVycmlkZXMgYW5k CisgICAgICAgIG1lbWJlciB2YXJpYWJsZXMgbmVjZXNzYXJ5IGZvciBzYXZlIHN1cHBvcnQuCisK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW06CisgICAgICAg IChXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6c2F2ZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3JGcm9udGVuZENsaWVudDo6YXBwZW5kKToKKyAgICAgICAgSW1wbGVtZW50ZWQgdGhlc2UgdG8g bWFrZSBzYXZpbmcgdGltZWxpbmUgZGF0YSB3b3JrLiAoSXQgc2VlbXMgdG8gbWUKKyAgICAgICAg dGhlIEluc3BlY3RvckZyb250ZW5kQ2xpZW50IEFQSSBjb3VsZCBiZSBjbGVhbmVkIHVwIGEgYml0 LiBJIGhhZCB0bworICAgICAgICBsb29rIGF0IENocm9taXVtIHNvdXJjZSBjb2RlIHRvIGRldGVy bWluZSB0aGF0IEkgbmVlZGVkIHRvIGNhbGwgYmFjaworICAgICAgICBpbnRvIHRoZSBJbnNwZWN0 b3JGcm9udGVuZEFQSSBKUyBvYmplY3QgYWZ0ZXIgc2F2aW5nL2FwcGVuZGluZywgYW5kCisgICAg ICAgIHRoYXQgSSBuZWVkZWQgdG8ga2VlcCBhIG1hcCBvZiBwYXNzZWQgVVJMcyAtPiBjaG9zZW4g VVJMcy4pCisKKyAgICAgICAgKC1bV2ViSW5zcGVjdG9yV2luZG93Q29udHJvbGxlciB3aW5kb3c6 d2lsbFBvc2l0aW9uU2hlZXQ6dXNpbmdSZWN0Ol0pOgorICAgICAgICBUd2Vha2VkIHRoZSBwb3Np dGlvbiBvZiB0aGUgc2hlZXQgc28gdGhhdCBvcGVuL3NhdmUgc2hlZXRzIGxvb2sgYQorICAgICAg ICBsaXR0bGUgYmV0dGUucgorCisgICAgICAgICgtW1dlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xs ZXIgd2ViVmlldzpydW5PcGVuUGFuZWxGb3JGaWxlQnV0dG9uV2l0aFJlc3VsdExpc3RlbmVyOmFs bG93TXVsdGlwbGVGaWxlczpdKToKKyAgICAgICAgSW1wbGVtZW50ZWQgdG8gbWFrZSBsb2FkaW5n IHRpbWVsaW5lIGRhdGEgd29yay4KKwogMjAxMi0xMi0yMCAgSWx5YSBUaWtob25vdnNreSAgPGxv aXNsb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXggZm9yIGNo cm9taXVtIG1hYyBhZnRlciByMTM4MjA2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuaAppbmRleCBjYjJmOTE3ZmUyY2E4Njk2 N2Q3NjJjYTJmYTRiZjk1Mzg2ODcxOWY2Li4yZmU3ZGMwZTQxNGM4NTRhMWNlNTk2M2YxNzlhYjM3 OGIzMjk3ZjE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9X ZWJJbnNwZWN0b3JDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9y dC9XZWJJbnNwZWN0b3JDbGllbnQuaApAQCAtMzcsMTAgKzM3LDEyIEBACiAjaW1wb3J0IDx3dGYv dGV4dC9XVEZTdHJpbmcuaD4KIAogI2lmZGVmIF9fT0JKQ19fCitAY2xhc3MgTlNVUkw7CiBAY2xh c3MgV2ViSW5zcGVjdG9yV2luZG93Q29udHJvbGxlcjsKIEBjbGFzcyBXZWJOb2RlSGlnaGxpZ2h0 ZXI7CiBAY2xhc3MgV2ViVmlldzsKICNlbHNlCitjbGFzcyBOU1VSTDsKIGNsYXNzIFdlYkluc3Bl Y3RvcldpbmRvd0NvbnRyb2xsZXI7CiBjbGFzcyBXZWJOb2RlSGlnaGxpZ2h0ZXI7CiBjbGFzcyBX ZWJWaWV3OwpAQCAtMTEwLDcgKzExMiwxMiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHZvaWQg dXBkYXRlV2luZG93VGl0bGUoKSBjb25zdDsKIAorICAgIHZpcnR1YWwgYm9vbCBjYW5TYXZlKCkg T1ZFUlJJREUgeyByZXR1cm4gdHJ1ZTsgfQorICAgIHZpcnR1YWwgdm9pZCBzYXZlKGNvbnN0IFN0 cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGNvbnRlbnQsIGJvb2wgZm9yY2VTYXZlQXMpIE9WRVJS SURFOworICAgIHZpcnR1YWwgdm9pZCBhcHBlbmQoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0 cmluZyYgY29udGVudCkgT1ZFUlJJREU7CisKICAgICBXZWJWaWV3KiBtX2luc3BlY3RlZFdlYlZp ZXc7CiAgICAgUmV0YWluUHRyPFdlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXI+IG1fd2luZG93 Q29udHJvbGxlcjsKICAgICBTdHJpbmcgbV9pbnNwZWN0ZWRVUkw7CisgICAgSGFzaE1hcDxTdHJp bmcsIFJldGFpblB0cjxOU1VSTD4+IG1fc2F2ZVVSTHM7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1tIGIvU291cmNl L1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1tCmluZGV4IDUz MzRmMzJjMmFjOTkyY2FlODYxYThkYmYzNTJjZmI5N2Y1OTZmY2UuLmQ5YzUyYmNmNzIwNzY2ZmQ4 ZDNhYmQ5ZTE0OGFhNTE5NTJjMGI5MzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dl YkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW0KQEAgLTQwLDggKzQwLDEwIEBA CiAjaW1wb3J0ICJXZWJVSURlbGVnYXRlLmgiCiAjaW1wb3J0ICJXZWJQb2xpY3lEZWxlZ2F0ZS5o IgogI2ltcG9ydCAiV2ViVmlld0ludGVybmFsLmgiCisjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lLmg+ CiAjaW1wb3J0IDxXZWJDb3JlL0luc3BlY3RvckNvbnRyb2xsZXIuaD4KICNpbXBvcnQgPFdlYkNv cmUvUGFnZS5oPgorI2ltcG9ydCA8V2ViQ29yZS9TY3JpcHRWYWx1ZS5oPgogI2ltcG9ydCA8V2Vi Q29yZS9Tb2Z0TGlua2luZy5oPgogI2ltcG9ydCA8V2ViS2l0L0RPTUV4dGVuc2lvbnMuaD4KICNp bXBvcnQgPFdlYktpdFN5c3RlbUludGVyZmFjZS5oPgpAQCAtMjk0LDYgKzI5Niw1MCBAQCB2b2lk IFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50Ojp1cGRhdGVXaW5kb3dUaXRsZSgpIGNvbnN0CiAg ICAgW1ttX3dpbmRvd0NvbnRyb2xsZXIuZ2V0KCkgd2luZG93XSBzZXRUaXRsZTp0aXRsZV07CiB9 CiAKK3ZvaWQgV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OnNhdmUoY29uc3QgU3RyaW5nJiBy ZWZVUkwsIGNvbnN0IFN0cmluZyYgcmVmQ29udGVudCwgYm9vbCBmb3JjZVNhdmVBcykKK3sKKyAg ICBTdHJpbmcgdXJsID0gcmVmVVJMOworICAgIFN0cmluZyBjb250ZW50ID0gcmVmQ29udGVudDsK KyAgICBhdXRvIHNhdmVUb1VSTCA9IF4oTlNVUkwgKlVSTCkgeworICAgICAgICBtX3NhdmVVUkxz LnNldCh1cmwsIFVSTCk7CisKKyAgICAgICAgW2NvbnRlbnQgd3JpdGVUb1VSTDpVUkwgYXRvbWlj YWxseTpZRVMgZW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmcgZXJyb3I6TlVMTF07CisgICAg ICAgIGNvcmUoW21fd2luZG93Q29udHJvbGxlciB3ZWJWaWV3XSktPm1haW5GcmFtZSgpLT5zY3Jp cHQoKS0+ZXhlY3V0ZVNjcmlwdChbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIkluc3BlY3Rv ckZyb250ZW5kQVBJLnNhdmVkVVJMKFwiJUBcIikiLCBVUkwuYWJzb2x1dGVTdHJpbmddKTsKKyAg ICB9OworCisgICAgTlNVUkwgKlVSTCA9IG1fc2F2ZVVSTHMuZ2V0KHVybCkuZ2V0KCk7CisgICAg aWYgKCFVUkwpCisgICAgICAgIFVSTCA9IFtOU1VSTCBVUkxXaXRoU3RyaW5nOnVybF07CisgICAg ZWxzZSBpZiAoIWZvcmNlU2F2ZUFzKSB7CisgICAgICAgIHNhdmVUb1VSTChVUkwpOworICAgICAg ICByZXR1cm47CisgICAgfQorCisgICAgTlNTYXZlUGFuZWwgKnBhbmVsID0gW05TU2F2ZVBhbmVs IHNhdmVQYW5lbF07CisgICAgcGFuZWwubmFtZUZpZWxkU3RyaW5nVmFsdWUgPSBVUkwubGFzdFBh dGhDb21wb25lbnQ7CisgICAgcGFuZWwuZGlyZWN0b3J5VVJMID0gW1VSTCBVUkxCeURlbGV0aW5n TGFzdFBhdGhDb21wb25lbnRdOworCisgICAgW3BhbmVsIGJlZ2luU2hlZXRNb2RhbEZvcldpbmRv dzpbbV93aW5kb3dDb250cm9sbGVyIHdpbmRvd10gY29tcGxldGlvbkhhbmRsZXI6XihOU0ludGVn ZXIgcmVzdWx0KSB7CisgICAgICAgIGlmIChyZXN1bHQgPT0gTlNGaWxlSGFuZGxpbmdQYW5lbENh bmNlbEJ1dHRvbikKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgQVNTRVJUKHJlc3VsdCA9 PSBOU0ZpbGVIYW5kbGluZ1BhbmVsT0tCdXR0b24pOworICAgICAgICBzYXZlVG9VUkwocGFuZWwu VVJMKTsKKyAgICB9XTsKK30KKwordm9pZCBXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6YXBw ZW5kKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGNvbnRlbnQpCit7CisgICAgUmV0 YWluUHRyPE5TVVJMPiBVUkwgPSBtX3NhdmVVUkxzLmdldCh1cmwpOworICAgIGlmICghVVJMKQor ICAgICAgICBVUkwgPSBbTlNVUkwgVVJMV2l0aFN0cmluZzp1cmxdOworCisgICAgTlNGaWxlSGFu ZGxlICpoYW5kbGUgPSBbTlNGaWxlSGFuZGxlIGZpbGVIYW5kbGVGb3JXcml0aW5nVG9VUkw6VVJM LmdldCgpIGVycm9yOk5VTExdOworICAgIFtoYW5kbGUgc2Vla1RvRW5kT2ZGaWxlXTsKKyAgICBb aGFuZGxlIHdyaXRlRGF0YTpbY29udGVudCBkYXRhVXNpbmdFbmNvZGluZzpOU1VURjhTdHJpbmdF bmNvZGluZ11dOworICAgIFtoYW5kbGUgY2xvc2VGaWxlXTsKKworICAgIGNvcmUoW21fd2luZG93 Q29udHJvbGxlciB3ZWJWaWV3XSktPm1haW5GcmFtZSgpLT5zY3JpcHQoKS0+ZXhlY3V0ZVNjcmlw dChbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIkluc3BlY3RvckZyb250ZW5kQVBJLmFwcGVu ZGVkVG9VUkwoXCIlQFwiKSIsIFtVUkwgYWJzb2x1dGVTdHJpbmddXSk7Cit9CiAKIC8vIE1BUks6 IC0KIApAQCAtNDM2LDYgKzQ4MiwxNCBAQCB2b2lkIFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50 Ojp1cGRhdGVXaW5kb3dUaXRsZSgpIGNvbnN0CiAKIC8vIE1BUks6IC0KIAorLSAoTlNSZWN0KXdp bmRvdzooTlNXaW5kb3cgKil3aW5kb3cgd2lsbFBvc2l0aW9uU2hlZXQ6KE5TV2luZG93ICopc2hl ZXQgdXNpbmdSZWN0OihOU1JlY3QpcmVjdAoreworICAgIC8vIEFwcEtpdCBkb2Vzbid0IGtub3cg YWJvdXQgb3VyIEhUTUwgdG9vbGJhciwgYW5kIHBsYWNlcyB0aGUgc2hlZXQganVzdCBhIGxpdHRs ZSBiaXQgdG9vIGhpZ2guCisgICAgLy8gRklYTUU6IEl0IHdvdWxkIGJlIGJldHRlciB0byBnZXQg dGhlIGhlaWdodCBvZiB0aGUgdG9vbGJhciBhbmQgdXNlIGl0IGluIHRoaXMgY2FsY3VsYXRpb24u CisgICAgcmVjdC5vcmlnaW4ueSAtPSAxOworICAgIHJldHVybiByZWN0OworfQorCiAtIChCT09M KXdpbmRvd1Nob3VsZENsb3NlOihpZClzZW5kZXIKIHsKICAgICBbc2VsZiBkZXN0cm95SW5zcGVj dG9yVmlldzp0cnVlXTsKQEAgLTYxNiw2ICs2NzAsMjkgQEAgdm9pZCBXZWJJbnNwZWN0b3JGcm9u dGVuZENsaWVudDo6dXBkYXRlV2luZG93VGl0bGUoKSBjb25zdAogICAgIHJldHVybiBXZWJEcmFn RGVzdGluYXRpb25BY3Rpb25Ob25lOwogfQogCistICh2b2lkKXdlYlZpZXc6KFdlYlZpZXcgKilz ZW5kZXIgcnVuT3BlblBhbmVsRm9yRmlsZUJ1dHRvbldpdGhSZXN1bHRMaXN0ZW5lcjooaWQ8V2Vi T3BlblBhbmVsUmVzdWx0TGlzdGVuZXI+KXJlc3VsdExpc3RlbmVyIGFsbG93TXVsdGlwbGVGaWxl czooQk9PTClhbGxvd011bHRpcGxlRmlsZXMKK3sKKyAgICBOU09wZW5QYW5lbCAqcGFuZWwgPSBb TlNPcGVuUGFuZWwgb3BlblBhbmVsXTsKKyAgICBwYW5lbC5jYW5DaG9vc2VEaXJlY3RvcmllcyA9 IE5POworICAgIHBhbmVsLmNhbkNob29zZUZpbGVzID0gWUVTOworICAgIHBhbmVsLmFsbG93c011 bHRpcGxlU2VsZWN0aW9uID0gYWxsb3dNdWx0aXBsZUZpbGVzOworCisgICAgW3BhbmVsIGJlZ2lu U2hlZXRNb2RhbEZvcldpbmRvdzpzZWxmLndpbmRvdyBjb21wbGV0aW9uSGFuZGxlcjpeKE5TSW50 ZWdlciByZXN1bHQpIHsKKyAgICAgICAgaWYgKHJlc3VsdCA9PSBOU0ZpbGVIYW5kbGluZ1BhbmVs Q2FuY2VsQnV0dG9uKSB7CisgICAgICAgICAgICBbcmVzdWx0TGlzdGVuZXIgY2FuY2VsXTsKKyAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBBU1NFUlQocmVzdWx0ID09IE5T RmlsZUhhbmRsaW5nUGFuZWxPS0J1dHRvbik7CisKKyAgICAgICAgTlNBcnJheSAqVVJMcyA9IHBh bmVsLlVSTHM7CisgICAgICAgIE5TTXV0YWJsZUFycmF5ICpmaWxlbmFtZXMgPSBbTlNNdXRhYmxl QXJyYXkgYXJyYXlXaXRoQ2FwYWNpdHk6VVJMcy5jb3VudF07CisgICAgICAgIGZvciAoTlNVUkwg KlVSTCBpbiBVUkxzKSB7CisgICAgICAgICAgICBbZmlsZW5hbWVzIGFkZE9iamVjdDpVUkwucGF0 aF07CisgICAgICAgIH0KKyAgICAgICAgW3Jlc3VsdExpc3RlbmVyIGNob29zZUZpbGVuYW1lczpm aWxlbmFtZXNdOworICAgIH1dOworfQorCiAvLyBNQVJLOiAtCiAvLyBNQVJLOiBQb2xpY3kgZGVs ZWdhdGUKIAo= 180398 2012-12-20 13:26:11 -0800 2012-12-29 08:15:35 -0800 Patch bug-105547-20121220162326.patch text/plain 6919 aroben U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4MjU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggODNmZjAxMzY2 ZWY5OWYyZTU3MGM5MTIyZDM3NjViNzZmOTA5ZjJiNi4uNjQxOWVhMmUyOTEyNjI2NDhkMjFkNWNm MDA5OTRjNzgwMTI2MjdiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEy LTEyLTIwICBBZGFtIFJvYmVuICA8YXJvYmVuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogTWFjIFdLMSBJbnNwZWN0b3IgY2FuJ3Qgc2F2ZS9sb2FkIHRpbWVsaW5lIGRhdGEK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTU0Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29y ZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lmg6IERlY2xhcmVkIG5ldyBvdmVycmlkZXMgYW5k CisgICAgICAgIG1lbWJlciB2YXJpYWJsZXMgbmVjZXNzYXJ5IGZvciBzYXZlIHN1cHBvcnQuCisK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW06CisgICAgICAg IChXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6c2F2ZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3JGcm9udGVuZENsaWVudDo6YXBwZW5kKToKKyAgICAgICAgSW1wbGVtZW50ZWQgdGhlc2UgdG8g bWFrZSBzYXZpbmcgdGltZWxpbmUgZGF0YSB3b3JrLiAoSXQgc2VlbXMgdG8gbWUKKyAgICAgICAg dGhlIEluc3BlY3RvckZyb250ZW5kQ2xpZW50IEFQSSBjb3VsZCBiZSBjbGVhbmVkIHVwIGEgYml0 LiBJIGhhZCB0bworICAgICAgICBsb29rIGF0IENocm9taXVtIHNvdXJjZSBjb2RlIHRvIGRldGVy bWluZSB0aGF0IEkgbmVlZGVkIHRvIGNhbGwgYmFjaworICAgICAgICBpbnRvIHRoZSBJbnNwZWN0 b3JGcm9udGVuZEFQSSBKUyBvYmplY3QgYWZ0ZXIgc2F2aW5nL2FwcGVuZGluZywgYW5kCisgICAg ICAgIHRoYXQgSSBuZWVkZWQgdG8ga2VlcCBhIG1hcCBvZiBwYXNzZWQgVVJMcyAtPiBjaG9zZW4g VVJMcy4pCisKKyAgICAgICAgKC1bV2ViSW5zcGVjdG9yV2luZG93Q29udHJvbGxlciB3aW5kb3c6 d2lsbFBvc2l0aW9uU2hlZXQ6dXNpbmdSZWN0Ol0pOgorICAgICAgICBUd2Vha2VkIHRoZSBwb3Np dGlvbiBvZiB0aGUgc2hlZXQgc28gdGhhdCBvcGVuL3NhdmUgc2hlZXRzIGxvb2sgYQorICAgICAg ICBsaXR0bGUgYmV0dGUucgorCisgICAgICAgICgtW1dlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xs ZXIgd2ViVmlldzpydW5PcGVuUGFuZWxGb3JGaWxlQnV0dG9uV2l0aFJlc3VsdExpc3RlbmVyOmFs bG93TXVsdGlwbGVGaWxlczpdKToKKyAgICAgICAgSW1wbGVtZW50ZWQgdG8gbWFrZSBsb2FkaW5n IHRpbWVsaW5lIGRhdGEgd29yay4KKwogMjAxMi0xMi0yMCAgSWx5YSBUaWtob25vdnNreSAgPGxv aXNsb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXggZm9yIGNo cm9taXVtIG1hYyBhZnRlciByMTM4MjA2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuaAppbmRleCBjYjJmOTE3ZmUyY2E4Njk2 N2Q3NjJjYTJmYTRiZjk1Mzg2ODcxOWY2Li4yZmU3ZGMwZTQxNGM4NTRhMWNlNTk2M2YxNzlhYjM3 OGIzMjk3ZjE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9X ZWJJbnNwZWN0b3JDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9y dC9XZWJJbnNwZWN0b3JDbGllbnQuaApAQCAtMzcsMTAgKzM3LDEyIEBACiAjaW1wb3J0IDx3dGYv dGV4dC9XVEZTdHJpbmcuaD4KIAogI2lmZGVmIF9fT0JKQ19fCitAY2xhc3MgTlNVUkw7CiBAY2xh c3MgV2ViSW5zcGVjdG9yV2luZG93Q29udHJvbGxlcjsKIEBjbGFzcyBXZWJOb2RlSGlnaGxpZ2h0 ZXI7CiBAY2xhc3MgV2ViVmlldzsKICNlbHNlCitjbGFzcyBOU1VSTDsKIGNsYXNzIFdlYkluc3Bl Y3RvcldpbmRvd0NvbnRyb2xsZXI7CiBjbGFzcyBXZWJOb2RlSGlnaGxpZ2h0ZXI7CiBjbGFzcyBX ZWJWaWV3OwpAQCAtMTEwLDcgKzExMiwxMiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHZvaWQg dXBkYXRlV2luZG93VGl0bGUoKSBjb25zdDsKIAorICAgIHZpcnR1YWwgYm9vbCBjYW5TYXZlKCkg T1ZFUlJJREUgeyByZXR1cm4gdHJ1ZTsgfQorICAgIHZpcnR1YWwgdm9pZCBzYXZlKGNvbnN0IFN0 cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGNvbnRlbnQsIGJvb2wgZm9yY2VTYXZlQXMpIE9WRVJS SURFOworICAgIHZpcnR1YWwgdm9pZCBhcHBlbmQoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0 cmluZyYgY29udGVudCkgT1ZFUlJJREU7CisKICAgICBXZWJWaWV3KiBtX2luc3BlY3RlZFdlYlZp ZXc7CiAgICAgUmV0YWluUHRyPFdlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXI+IG1fd2luZG93 Q29udHJvbGxlcjsKICAgICBTdHJpbmcgbV9pbnNwZWN0ZWRVUkw7CisgICAgSGFzaE1hcDxTdHJp bmcsIFJldGFpblB0cjxOU1VSTD4+IG1fc2F2ZVVSTHM7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1tIGIvU291cmNl L1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1tCmluZGV4IDUz MzRmMzJjMmFjOTkyY2FlODYxYThkYmYzNTJjZmI5N2Y1OTZmY2UuLjVkMmYwYTQyMTJiNzcwMDMw ZDYzNTQ2ZWYyOTM2NDUwNTJjYzRiNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dl YkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW0KQEAgLTQwLDggKzQwLDEwIEBA CiAjaW1wb3J0ICJXZWJVSURlbGVnYXRlLmgiCiAjaW1wb3J0ICJXZWJQb2xpY3lEZWxlZ2F0ZS5o IgogI2ltcG9ydCAiV2ViVmlld0ludGVybmFsLmgiCisjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lLmg+ CiAjaW1wb3J0IDxXZWJDb3JlL0luc3BlY3RvckNvbnRyb2xsZXIuaD4KICNpbXBvcnQgPFdlYkNv cmUvUGFnZS5oPgorI2ltcG9ydCA8V2ViQ29yZS9TY3JpcHRWYWx1ZS5oPgogI2ltcG9ydCA8V2Vi Q29yZS9Tb2Z0TGlua2luZy5oPgogI2ltcG9ydCA8V2ViS2l0L0RPTUV4dGVuc2lvbnMuaD4KICNp bXBvcnQgPFdlYktpdFN5c3RlbUludGVyZmFjZS5oPgpAQCAtMjk0LDYgKzI5Niw1MCBAQCB2b2lk IFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50Ojp1cGRhdGVXaW5kb3dUaXRsZSgpIGNvbnN0CiAg ICAgW1ttX3dpbmRvd0NvbnRyb2xsZXIuZ2V0KCkgd2luZG93XSBzZXRUaXRsZTp0aXRsZV07CiB9 CiAKK3ZvaWQgV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OnNhdmUoY29uc3QgU3RyaW5nJiBy ZWZVUkwsIGNvbnN0IFN0cmluZyYgcmVmQ29udGVudCwgYm9vbCBmb3JjZVNhdmVBcykKK3sKKyAg ICBTdHJpbmcgdXJsID0gcmVmVVJMOworICAgIFN0cmluZyBjb250ZW50ID0gcmVmQ29udGVudDsK KyAgICBhdXRvIHNhdmVUb1VSTCA9IF4oTlNVUkwgKlVSTCkgeworICAgICAgICBtX3NhdmVVUkxz LnNldCh1cmwsIFVSTCk7CisKKyAgICAgICAgW2NvbnRlbnQgd3JpdGVUb1VSTDpVUkwgYXRvbWlj YWxseTpZRVMgZW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmcgZXJyb3I6TlVMTF07CisgICAg ICAgIGNvcmUoW21fd2luZG93Q29udHJvbGxlciB3ZWJWaWV3XSktPm1haW5GcmFtZSgpLT5zY3Jp cHQoKS0+ZXhlY3V0ZVNjcmlwdChbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIkluc3BlY3Rv ckZyb250ZW5kQVBJLnNhdmVkVVJMKFwiJUBcIikiLCBVUkwuYWJzb2x1dGVTdHJpbmddKTsKKyAg ICB9OworCisgICAgTlNVUkwgKlVSTCA9IG1fc2F2ZVVSTHMuZ2V0KHVybCkuZ2V0KCk7CisgICAg aWYgKCFVUkwpCisgICAgICAgIFVSTCA9IFtOU1VSTCBVUkxXaXRoU3RyaW5nOnVybF07CisgICAg ZWxzZSBpZiAoIWZvcmNlU2F2ZUFzKSB7CisgICAgICAgIHNhdmVUb1VSTChVUkwpOworICAgICAg ICByZXR1cm47CisgICAgfQorCisgICAgTlNTYXZlUGFuZWwgKnBhbmVsID0gW05TU2F2ZVBhbmVs IHNhdmVQYW5lbF07CisgICAgcGFuZWwubmFtZUZpZWxkU3RyaW5nVmFsdWUgPSBVUkwubGFzdFBh dGhDb21wb25lbnQ7CisgICAgcGFuZWwuZGlyZWN0b3J5VVJMID0gW1VSTCBVUkxCeURlbGV0aW5n TGFzdFBhdGhDb21wb25lbnRdOworCisgICAgW3BhbmVsIGJlZ2luU2hlZXRNb2RhbEZvcldpbmRv dzpbW21fd2luZG93Q29udHJvbGxlciB3ZWJWaWV3XSB3aW5kb3ddIGNvbXBsZXRpb25IYW5kbGVy Ol4oTlNJbnRlZ2VyIHJlc3VsdCkgeworICAgICAgICBpZiAocmVzdWx0ID09IE5TRmlsZUhhbmRs aW5nUGFuZWxDYW5jZWxCdXR0b24pCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIEFTU0VS VChyZXN1bHQgPT0gTlNGaWxlSGFuZGxpbmdQYW5lbE9LQnV0dG9uKTsKKyAgICAgICAgc2F2ZVRv VVJMKHBhbmVsLlVSTCk7CisgICAgfV07Cit9CisKK3ZvaWQgV2ViSW5zcGVjdG9yRnJvbnRlbmRD bGllbnQ6OmFwcGVuZChjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBjb250ZW50KQor eworICAgIFJldGFpblB0cjxOU1VSTD4gVVJMID0gbV9zYXZlVVJMcy5nZXQodXJsKTsKKyAgICBp ZiAoIVVSTCkKKyAgICAgICAgVVJMID0gW05TVVJMIFVSTFdpdGhTdHJpbmc6dXJsXTsKKworICAg IE5TRmlsZUhhbmRsZSAqaGFuZGxlID0gW05TRmlsZUhhbmRsZSBmaWxlSGFuZGxlRm9yV3JpdGlu Z1RvVVJMOlVSTC5nZXQoKSBlcnJvcjpOVUxMXTsKKyAgICBbaGFuZGxlIHNlZWtUb0VuZE9mRmls ZV07CisgICAgW2hhbmRsZSB3cml0ZURhdGE6W2NvbnRlbnQgZGF0YVVzaW5nRW5jb2Rpbmc6TlNV VEY4U3RyaW5nRW5jb2RpbmddXTsKKyAgICBbaGFuZGxlIGNsb3NlRmlsZV07CisKKyAgICBjb3Jl KFttX3dpbmRvd0NvbnRyb2xsZXIgd2ViVmlld10pLT5tYWluRnJhbWUoKS0+c2NyaXB0KCktPmV4 ZWN1dGVTY3JpcHQoW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJJbnNwZWN0b3JGcm9udGVu ZEFQSS5hcHBlbmRlZFRvVVJMKFwiJUBcIikiLCBbVVJMIGFic29sdXRlU3RyaW5nXV0pOworfQog CiAvLyBNQVJLOiAtCiAKQEAgLTQzNiw2ICs0ODIsMTQgQEAgdm9pZCBXZWJJbnNwZWN0b3JGcm9u dGVuZENsaWVudDo6dXBkYXRlV2luZG93VGl0bGUoKSBjb25zdAogCiAvLyBNQVJLOiAtCiAKKy0g KE5TUmVjdCl3aW5kb3c6KE5TV2luZG93ICopd2luZG93IHdpbGxQb3NpdGlvblNoZWV0OihOU1dp bmRvdyAqKXNoZWV0IHVzaW5nUmVjdDooTlNSZWN0KXJlY3QKK3sKKyAgICAvLyBBcHBLaXQgZG9l c24ndCBrbm93IGFib3V0IG91ciBIVE1MIHRvb2xiYXIsIGFuZCBwbGFjZXMgdGhlIHNoZWV0IGp1 c3QgYSBsaXR0bGUgYml0IHRvbyBoaWdoLgorICAgIC8vIEZJWE1FOiBJdCB3b3VsZCBiZSBiZXR0 ZXIgdG8gZ2V0IHRoZSBoZWlnaHQgb2YgdGhlIHRvb2xiYXIgYW5kIHVzZSBpdCBpbiB0aGlzIGNh bGN1bGF0aW9uLgorICAgIHJlY3Qub3JpZ2luLnkgLT0gMTsKKyAgICByZXR1cm4gcmVjdDsKK30K KwogLSAoQk9PTCl3aW5kb3dTaG91bGRDbG9zZTooaWQpc2VuZGVyCiB7CiAgICAgW3NlbGYgZGVz dHJveUluc3BlY3RvclZpZXc6dHJ1ZV07CkBAIC02MTYsNiArNjcwLDI5IEBAIHZvaWQgV2ViSW5z cGVjdG9yRnJvbnRlbmRDbGllbnQ6OnVwZGF0ZVdpbmRvd1RpdGxlKCkgY29uc3QKICAgICByZXR1 cm4gV2ViRHJhZ0Rlc3RpbmF0aW9uQWN0aW9uTm9uZTsKIH0KIAorLSAodm9pZCl3ZWJWaWV3OihX ZWJWaWV3ICopc2VuZGVyIHJ1bk9wZW5QYW5lbEZvckZpbGVCdXR0b25XaXRoUmVzdWx0TGlzdGVu ZXI6KGlkPFdlYk9wZW5QYW5lbFJlc3VsdExpc3RlbmVyPilyZXN1bHRMaXN0ZW5lciBhbGxvd011 bHRpcGxlRmlsZXM6KEJPT0wpYWxsb3dNdWx0aXBsZUZpbGVzCit7CisgICAgTlNPcGVuUGFuZWwg KnBhbmVsID0gW05TT3BlblBhbmVsIG9wZW5QYW5lbF07CisgICAgcGFuZWwuY2FuQ2hvb3NlRGly ZWN0b3JpZXMgPSBOTzsKKyAgICBwYW5lbC5jYW5DaG9vc2VGaWxlcyA9IFlFUzsKKyAgICBwYW5l bC5hbGxvd3NNdWx0aXBsZVNlbGVjdGlvbiA9IGFsbG93TXVsdGlwbGVGaWxlczsKKworICAgIFtw YW5lbCBiZWdpblNoZWV0TW9kYWxGb3JXaW5kb3c6X3dlYlZpZXcud2luZG93IGNvbXBsZXRpb25I YW5kbGVyOl4oTlNJbnRlZ2VyIHJlc3VsdCkgeworICAgICAgICBpZiAocmVzdWx0ID09IE5TRmls ZUhhbmRsaW5nUGFuZWxDYW5jZWxCdXR0b24pIHsKKyAgICAgICAgICAgIFtyZXN1bHRMaXN0ZW5l ciBjYW5jZWxdOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIEFTU0VS VChyZXN1bHQgPT0gTlNGaWxlSGFuZGxpbmdQYW5lbE9LQnV0dG9uKTsKKworICAgICAgICBOU0Fy cmF5ICpVUkxzID0gcGFuZWwuVVJMczsKKyAgICAgICAgTlNNdXRhYmxlQXJyYXkgKmZpbGVuYW1l cyA9IFtOU011dGFibGVBcnJheSBhcnJheVdpdGhDYXBhY2l0eTpVUkxzLmNvdW50XTsKKyAgICAg ICAgZm9yIChOU1VSTCAqVVJMIGluIFVSTHMpIHsKKyAgICAgICAgICAgIFtmaWxlbmFtZXMgYWRk T2JqZWN0OlVSTC5wYXRoXTsKKyAgICAgICAgfQorICAgICAgICBbcmVzdWx0TGlzdGVuZXIgY2hv b3NlRmlsZW5hbWVzOmZpbGVuYW1lc107CisgICAgfV07Cit9CisKIC8vIE1BUks6IC0KIC8vIE1B Uks6IFBvbGljeSBkZWxlZ2F0ZQogCg==