107907 2013-01-24 20:41:12 -0800 Support language WebVTT Nodes 2013-01-25 16:22:21 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 43668 1 dgorbik dgorbik dgorbik eric.carlson feature-media-reviews koivisto ojan.autocc silviapf webkit-bug-importer webkit.review.bot oldest_to_newest 816137 0 dgorbik 2013-01-24 20:41:12 -0800 Language WebVTT nodes are used to define a language for children objects without implying further meaning (such as italics or bold) 816151 1 webkit-bug-importer 2013-01-24 20:59:00 -0800 <rdar://problem/13084183> 816152 2 webkit-bug-importer 2013-01-24 20:59:03 -0800 <rdar://problem/13084184> 816154 3 184651 dgorbik 2013-01-24 21:00:00 -0800 Created attachment 184651 Proposed fix 0.1 816393 4 184651 koivisto 2013-01-25 01:59:43 -0800 Comment on attachment 184651 Proposed fix 0.1 View in context: https://bugs.webkit.org/attachment.cgi?id=184651&action=review > Source/WebCore/html/track/WebVTTParser.cpp:345 > +inline bool isLangToken(WebVTTToken& token) static inline > Source/WebCore/html/track/WebVTTParser.h:136 > + Vector<AtomicString> languageStack; m_languageStack 816971 5 184822 dgorbik 2013-01-25 15:46:06 -0800 Created attachment 184822 Proposed fix 0.2 817008 6 184822 eric.carlson 2013-01-25 16:06:52 -0800 Comment on attachment 184822 Proposed fix 0.2 Marking r+ based on antti's earlier review. 817024 7 184822 webkit.review.bot 2013-01-25 16:22:17 -0800 Comment on attachment 184822 Proposed fix 0.2 Clearing flags on attachment: 184822 Committed r140877: <http://trac.webkit.org/changeset/140877> 817025 8 webkit.review.bot 2013-01-25 16:22:21 -0800 All reviewed patches have been landed. Closing bug. 184651 2013-01-24 21:00:00 -0800 2013-01-25 15:46:06 -0800 Proposed fix 0.1 patch text/plain 11206 dgorbik ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3MGFlMTk2Li5lMGRjZmU4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMtMDEt MjQgIERpbWEgR29yYmlrICA8ZGdvcmJpa0BhcHBsZS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBs YW5ndWFnZSBXZWJWVFQgTm9kZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwNzkwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogbWVkaWEvdHJhY2svY2FwdGlvbnMtd2VidnR0L3N0eWxpbmctbGFuZy52 dHQ6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL3RyYWNrL3RyYWNrLWNzcy1tYXRjaGluZy1sYW5n LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogbWVkaWEvdHJhY2svdHJhY2stY3NzLW1h dGNoaW5nLWxhbmcuaHRtbDogQWRkZWQuCisKIDIwMTMtMDEtMjQgIE1pY2hhZWwgU2Fib2ZmICA8 bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGpzL3JlZ3Jlc3MgdGVzdHMgZm9yIGlu dGVnZXIgbW9kdWxvCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS90cmFjay9jYXB0aW9u cy13ZWJ2dHQvc3R5bGluZy1sYW5nLnZ0dCBiL0xheW91dFRlc3RzL21lZGlhL3RyYWNrL2NhcHRp b25zLXdlYnZ0dC9zdHlsaW5nLWxhbmcudnR0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAuLjYzZWRhOTYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS90cmFj ay9jYXB0aW9ucy13ZWJ2dHQvc3R5bGluZy1sYW5nLnZ0dApAQCAtMCwwICsxLDUgQEAKK1dFQlZU VAorCisxCiswMDowMC4wMDAgLS0+IDAwOjAxLjAwMAorPGxhbmcgZW4+PGM+RW5nbGlzaDxsYW5n IHJ1PjxjPiDQoNGD0YHRgdC60LjQuTxsYW5nIGVuPjxjPiBFbmdsaXNoIGFnYWluPC9jPjwvbGFu Zz48L2M+PC9sYW5nPjwvYz48L2xhbmc+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS90 cmFjay90cmFjay1jc3MtbWF0Y2hpbmctbGFuZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9t ZWRpYS90cmFjay90cmFjay1jc3MtbWF0Y2hpbmctbGFuZy1leHBlY3RlZC50eHQKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYzIwODNkNAotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWNzcy1tYXRjaGluZy1sYW5nLWV4cGVjdGVkLnR4 dApAQCAtMCwwICsxLDggQEAKK1Rlc3QgdGhhdCBjdWVzIGFyZSBiZWluZyBtYXRjaGVkIHByb3Bl cmx5IGJ5IHRoZSBsYW5nIGF0dHJpYnV0ZS4KK0VWRU5UKGNhbnBsYXl0aHJvdWdoKQorRVZFTlQo c2Vla2VkKQorRVhQRUNURUQgKGdldENvbXB1dGVkU3R5bGUoY3VlTm9kZSkuY29sb3IgPT0gJ3Jn YigwLCAxMjgsIDApJykgT0sKK0VYUEVDVEVEIChnZXRDb21wdXRlZFN0eWxlKGN1ZU5vZGUpLmNv bG9yID09ICdyZ2IoMjU1LCAwLCAwKScpIE9LCitFWFBFQ1RFRCAoZ2V0Q29tcHV0ZWRTdHlsZShj dWVOb2RlKS5jb2xvciA9PSAncmdiKDAsIDEyOCwgMCknKSBPSworRU5EIE9GIFRFU1QKKwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2stY3NzLW1hdGNoaW5nLWxhbmcu aHRtbCBiL0xheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWNzcy1tYXRjaGluZy1sYW5nLmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODVlODRjOQotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWNzcy1tYXRjaGluZy1sYW5n Lmh0bWwKQEAgLTAsMCArMSw2MCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVh ZD4KKyAgICAgICAgPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0 L2h0bWw7IGNoYXJzZXQ9dXRmLTgiIC8+CisKKyAgICAgICAgPHNjcmlwdCBzcmM9Li4vbWVkaWEt ZmlsZS5qcz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Li4vdmlkZW8tdGVzdC5qcz48 L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Li4vbWVkaWEtY29udHJvbHMuanM+PC9zY3Jp cHQ+CisKKyAgICAgICAgPHN0eWxlPgorICAgICAgICA6OmN1ZShjW2xhbmc9InJ1Il0pIHsgY29s b3I6IHJlZDsgfQorICAgICAgICA6OmN1ZShjW2xhbmc9ImVuIl0pIHsgY29sb3I6IGdyZWVuOyB9 CisgICAgICAgIDwvc3R5bGU+CisKKyAgICAgICAgPHNjcmlwdD4KKworICAgICAgICB2YXIgY3Vl Tm9kZTsKKyAgICAgICAgdmFyIHNlZWtlZENvdW50ID0gMDsKKyAgICAgICAgdmFyIHNlZWtUaW1l cyA9IFswLjFdOworCisgICAgICAgIHZhciBpbmZvID0gW1sicmdiKDAsIDEyOCwgMCkiLCAicmdi KDI1NSwgMCwgMCkiLCAicmdiKDAsIDEyOCwgMCkiXV07CisKKyAgICAgICAgZnVuY3Rpb24gc2Vl a2VkKCkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKHRlc3RFbmRlZCkKKyAgICAgICAgICAg ICAgICByZXR1cm47CisKKyAgICAgICAgICAgIGN1ZU5vZGUgPSB0ZXh0VHJhY2tEaXNwbGF5RWxl bWVudCh2aWRlbywgJ2FsbC1ub2RlcycpLmZpcnN0RWxlbWVudENoaWxkLmZpcnN0RWxlbWVudENo aWxkOworICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxlKGN1ZU5vZGUp LmNvbG9yIiwgaW5mb1tzZWVrZWRDb3VudF1bMF0pOworICAgICAgICAgICAgY3VlTm9kZSA9IGN1 ZU5vZGUuZmlyc3RFbGVtZW50Q2hpbGQuZmlyc3RFbGVtZW50Q2hpbGQ7CisgICAgICAgICAgICB0 ZXN0RXhwZWN0ZWQoImdldENvbXB1dGVkU3R5bGUoY3VlTm9kZSkuY29sb3IiLCBpbmZvW3NlZWtl ZENvdW50XVsxXSk7CisgICAgICAgICAgICBjdWVOb2RlID0gY3VlTm9kZS5maXJzdEVsZW1lbnRD aGlsZC5maXJzdEVsZW1lbnRDaGlsZDsKKyAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgiZ2V0Q29t cHV0ZWRTdHlsZShjdWVOb2RlKS5jb2xvciIsIGluZm9bc2Vla2VkQ291bnRdWzJdKTsKKworICAg ICAgICAgICAgaWYgKCsrc2Vla2VkQ291bnQgPT0gaW5mby5sZW5ndGgpCisgICAgICAgICAgICAg ICAgZW5kVGVzdCgpOworICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgICAgY29uc29s ZVdyaXRlKCIiKTsKKyAgICAgICAgICAgICAgICBydW4oInZpZGVvLmN1cnJlbnRUaW1lID0gIiAr IHNlZWtUaW1lc1tzZWVrZWRDb3VudF0pOworICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAg ICAgICAgZnVuY3Rpb24gbG9hZGVkKCkKKyAgICAgICAgeworICAgICAgICAgICAgY29uc29sZVdy aXRlKCJUZXN0IHRoYXQgY3VlcyBhcmUgYmVpbmcgbWF0Y2hlZCBwcm9wZXJseSBieSB0aGUgbGFu ZyBhdHRyaWJ1dGUuIik7CisgICAgICAgICAgICBmaW5kTWVkaWFFbGVtZW50KCk7CisgICAgICAg ICAgICB2aWRlby5zcmMgPSBmaW5kTWVkaWFGaWxlKCd2aWRlbycsICcuLi9jb250ZW50L3Rlc3Qn KTsKKyAgICAgICAgICAgIHZpZGVvLmlkID0gInRlc3R2aWRlbyI7CisgICAgICAgICAgICB3YWl0 Rm9yRXZlbnQoJ3NlZWtlZCcsIHNlZWtlZCk7CisgICAgICAgICAgICB3YWl0Rm9yRXZlbnQoJ2Nh bnBsYXl0aHJvdWdoJywgZnVuY3Rpb24oKSB7IHZpZGVvLmN1cnJlbnRUaW1lID0gc2Vla1RpbWVz WzBdOyB9KTsKKyAgICAgICAgfQorCisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvaGVhZD4KKyAg ICA8Ym9keSBvbmxvYWQ9ImxvYWRlZCgpIj4KKyAgICAgICAgPHZpZGVvIGNvbnRyb2xzID4KKyAg ICAgICAgICAgIDx0cmFjayBzcmM9ImNhcHRpb25zLXdlYnZ0dC9zdHlsaW5nLWxhbmcudnR0IiBr aW5kPSJjYXB0aW9ucyIgZGVmYXVsdD4KKyAgICAgICAgPC92aWRlbz4KKyAgICA8L2JvZHk+Cis8 L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKaW5kZXggODhjNzg3Ni4uODA0NTJiZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDMxIEBACisyMDEzLTAxLTI0ICBEaW1hIEdvcmJpayAgPGRnb3JiaWtAYXBwbGUuY29tPgor CisgICAgICAgIFN1cHBvcnQgbGFuZ3VhZ2UgV2ViVlRUIE5vZGVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDc5MDcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMYW5ndWFnZSBzdGFjayBhbmQgV2ViVlRU IGxhbmd1YWdlIG5vZGVzIGFyZSBhZGRlZCBhcyAKKyAgICAgICAgcmVxdWlyZWQgYnkgc3BlY3Mu CisKKyAgICAgICAgVGVzdDogbWVkaWEvdHJhY2svdHJhY2stY3NzLW1hdGNoaW5nLWxhbmcuaHRt bAorCisgICAgICAgICogaHRtbC90cmFjay9UZXh0VHJhY2tDdWUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6VGV4dFRyYWNrQ3VlOjpjb3B5V2ViVlRUTm9kZVRvRE9NVHJlZSk6IFdlYlZUVCBsYW5n dWFnZSBub2RlcyBzaG91bGQgYmUKKyAgICAgICAgc3BhbnMgaW4gRE9NIGFuZCB0aGUgbGFuZyBh dHRyaWJ1dGUgc2hvdWxkIGJlIHNldCBmb3IgYWxsIG5vZGVzIGlmIGFwcGxpY2FibGUuCisgICAg ICAgICogaHRtbC90cmFjay9UZXh0VHJhY2tDdWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRU cmFja0N1ZTo6bGFuZ0VsZW1lbnRUYWdOYW1lKToKKyAgICAgICAgKFRleHRUcmFja0N1ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpUZXh0VHJhY2tDdWU6OmxhbmdBdHRyaWJ1dGVOYW1lKToKKyAgICAg ICAgKiBodG1sL3RyYWNrL1dlYlZUVFBhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJW VFRQYXJzZXI6OmNyZWF0ZURvY3VtZW50RnJhZ21lbnRGcm9tQ3VlVGV4dCk6IGNsZWFyIHRoZSBs YW5ndWFnZSBzdGFjayBpbiBjYXNlCisgICAgICAgIHdlIHVzZSB0aGUgc2FtZSBwYXJzZXIgb2Jq ZWN0IGZvciBtdWx0aXBsZSBjdWVzIHRoYXQgaGF2ZSBpbmNvcnJlY3Qgc3ludGF4LgorICAgICAg ICAoV2ViQ29yZTo6aXNMYW5nVG9rZW4pOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChX ZWJDb3JlOjpXZWJWVFRQYXJzZXI6OmNvbnN0cnVjdFRyZWVGcm9tVG9rZW4pOiBwYXJzZSBsYW5n IFdlYlZUVCBvYmplY3RzLgorICAgICAgICAqIGh0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmg6Cisg ICAgICAgIChXZWJWVFRQYXJzZXIpOgorCiAyMDEzLTAxLTI0ICBLZW50YXJvIEhhcmEgIDxoYXJh a2VuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcAppbmRleCAzODQ1YTc0Li4yZjFh MDc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWUuY3BwCkBAIC01 MDQsMTAgKzUwNCwxMSBAQCB2b2lkIFRleHRUcmFja0N1ZTo6Y29weVdlYlZUVE5vZGVUb0RPTVRy ZWUoQ29udGFpbmVyTm9kZSogd2ViVlRUTm9kZSwgQ29udGFpbmVyTgogICAgIGZvciAoTm9kZSog bm9kZSA9IHdlYlZUVE5vZGUtPmZpcnN0Q2hpbGQoKTsgbm9kZTsgbm9kZSA9IG5vZGUtPm5leHRT aWJsaW5nKCkpIHsKICAgICAgICAgUmVmUHRyPE5vZGU+IGNsb25lZE5vZGU7CiAgICAgICAgIC8v IFNwZWNzIHJlcXVpcmUgdm9pY2UgYW5kIGNsYXNzIFdlYlZUVCBlbGVtZW50cyB0byBiZSBzcGFu cyBmb3IgRE9NIHRyZWVzLgotICAgICAgICBpZiAobm9kZS0+aGFzVGFnTmFtZSh2b2ljZUVsZW1l bnRUYWdOYW1lKCkpIHx8IG5vZGUtPmhhc1RhZ05hbWUoY2xhc3NFbGVtZW50VGFnTmFtZSgpKSkg eworICAgICAgICBpZiAobm9kZS0+aGFzVGFnTmFtZSh2b2ljZUVsZW1lbnRUYWdOYW1lKCkpIHx8 IG5vZGUtPmhhc1RhZ05hbWUoY2xhc3NFbGVtZW50VGFnTmFtZSgpKSB8fCBub2RlLT5oYXNUYWdO YW1lKGxhbmdFbGVtZW50VGFnTmFtZSgpKSkgewogICAgICAgICAgICAgY2xvbmVkTm9kZSA9IEhU TUxTcGFuRWxlbWVudDo6Y3JlYXRlKHNwYW5UYWcsIHN0YXRpY19jYXN0PERvY3VtZW50Kj4obV9z Y3JpcHRFeGVjdXRpb25Db250ZXh0KSk7CiAgICAgICAgICAgICB0b0VsZW1lbnQoY2xvbmVkTm9k ZS5nZXQoKSktPnNldEF0dHJpYnV0ZShjbGFzc0F0dHIsIHRvRWxlbWVudChub2RlKS0+Z2V0QXR0 cmlidXRlKGNsYXNzQXR0cikpOwogICAgICAgICAgICAgdG9FbGVtZW50KGNsb25lZE5vZGUuZ2V0 KCkpLT5zZXRBdHRyaWJ1dGUodGl0bGVBdHRyLCB0b0VsZW1lbnQobm9kZSktPmdldEF0dHJpYnV0 ZSh2b2ljZUF0dHJpYnV0ZU5hbWUoKSkpOworICAgICAgICAgICAgdG9FbGVtZW50KGNsb25lZE5v ZGUuZ2V0KCkpLT5zZXRBdHRyaWJ1dGUobGFuZ0F0dHIsIHRvRWxlbWVudChub2RlKS0+Z2V0QXR0 cmlidXRlKGxhbmdBdHRyaWJ1dGVOYW1lKCkpKTsKICAgICAgICAgfSBlbHNlCiAgICAgICAgICAg ICBjbG9uZWROb2RlID0gbm9kZS0+Y2xvbmVOb2RlKGZhbHNlKTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWUuaCBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmgKaW5kZXggY2MxNmYwNy4uMjg3YWJlZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWUuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5oCkBAIC04NSw2ICs4NSwxMiBAQCBwdWJs aWM6CiAgICAgICAgIHJldHVybiBjdWU7CiAgICAgfQogCisgICAgc3RhdGljIGNvbnN0IFF1YWxp ZmllZE5hbWUmIGxhbmdFbGVtZW50VGFnTmFtZSgpCisgICAgeworICAgICAgICBERUZJTkVfU1RB VElDX0xPQ0FMKFF1YWxpZmllZE5hbWUsIGxhbmdUYWcsIChudWxsQXRvbSwgImxhbmciLCBudWxs QXRvbSkpOworICAgICAgICByZXR1cm4gbGFuZ1RhZzsKKyAgICB9CisKICAgICBzdGF0aWMgY29u c3QgUXVhbGlmaWVkTmFtZSYgdm9pY2VFbGVtZW50VGFnTmFtZSgpCiAgICAgewogICAgICAgICBE RUZJTkVfU1RBVElDX0xPQ0FMKFF1YWxpZmllZE5hbWUsIHZUYWcsIChudWxsQXRvbSwgInYiLCBu dWxsQXRvbSkpOwpAQCAtOTYsMTMgKzEwMiwxOSBAQCBwdWJsaWM6CiAgICAgICAgIERFRklORV9T VEFUSUNfTE9DQUwoUXVhbGlmaWVkTmFtZSwgY1RhZywgKG51bGxBdG9tLCAiYyIsIG51bGxBdG9t KSk7CiAgICAgICAgIHJldHVybiBjVGFnOwogICAgIH0KLSAgICAKKwogICAgIHN0YXRpYyBjb25z dCBRdWFsaWZpZWROYW1lJiB2b2ljZUF0dHJpYnV0ZU5hbWUoKQogICAgIHsKICAgICAgICAgREVG SU5FX1NUQVRJQ19MT0NBTChRdWFsaWZpZWROYW1lLCB2b2ljZUF0dHIsIChudWxsQXRvbSwgInZv aWNlIiwgbnVsbEF0b20pKTsKICAgICAgICAgcmV0dXJuIHZvaWNlQXR0cjsKICAgICB9CiAKKyAg ICBzdGF0aWMgY29uc3QgUXVhbGlmaWVkTmFtZSYgbGFuZ0F0dHJpYnV0ZU5hbWUoKQorICAgIHsK KyAgICAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChRdWFsaWZpZWROYW1lLCB2b2ljZUF0dHIsIChu dWxsQXRvbSwgImxhbmciLCBudWxsQXRvbSkpOworICAgICAgICByZXR1cm4gdm9pY2VBdHRyOwor ICAgIH0KKwogICAgIHZpcnR1YWwgflRleHRUcmFja0N1ZSgpOwogCiAgICAgc3RhdGljIGNvbnN0 IEF0b21pY1N0cmluZyYgYWxsTm9kZXNTaGFkb3dQc2V1ZG9JZCgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv aHRtbC90cmFjay9XZWJWVFRQYXJzZXIuY3BwCmluZGV4IDQxZTU0OWUuLjBmMDczNmMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1dlYlZUVFBhcnNlci5jcHAKQEAgLTI1MSw2ICsyNTEs NyBAQCBQYXNzUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+ICBXZWJWVFRQYXJzZXI6OmNyZWF0ZURv Y3VtZW50RnJhZ21lbnRGcm9tQ3VlVGV4dChjbwogICAgIG1fdG9rZW5pemVyLT5yZXNldCgpOwog ICAgIG1fdG9rZW4uY2xlYXIoKTsKICAgICAKKyAgICBsYW5ndWFnZVN0YWNrLmNsZWFyKCk7CiAg ICAgU2VnbWVudGVkU3RyaW5nIGNvbnRlbnQodGV4dCk7CiAgICAgd2hpbGUgKG1fdG9rZW5pemVy LT5uZXh0VG9rZW4oY29udGVudCwgbV90b2tlbikpCiAgICAgICAgIGNvbnN0cnVjdFRyZWVGcm9t VG9rZW4oZG9jdW1lbnQpOwpAQCAtMzQxLDYgKzM0MiwxMSBAQCBkb3VibGUgV2ViVlRUUGFyc2Vy Ojpjb2xsZWN0VGltZVN0YW1wKGNvbnN0IFN0cmluZyYgbGluZSwgdW5zaWduZWQqIHBvc2l0aW9u KQogICAgIHJldHVybiAodmFsdWUxICogc2Vjb25kc1BlckhvdXIpICsgKHZhbHVlMiAqIHNlY29u ZHNQZXJNaW51dGUpICsgdmFsdWUzICsgKHZhbHVlNCAqIHNlY29uZHNQZXJNaWxsaXNlY29uZCk7 CiB9CiAKK2lubGluZSBib29sIGlzTGFuZ1Rva2VuKFdlYlZUVFRva2VuJiB0b2tlbikKK3sKKyAg ICByZXR1cm4gdG9rZW4ubmFtZSgpLnNpemUoKSA9PSA0ICYmIHRva2VuLm5hbWUoKVswXSA9PSAn bCcgJiYgdG9rZW4ubmFtZSgpWzFdID09ICdhJyAmJiB0b2tlbi5uYW1lKClbMl0gPT0gJ24nICYm IHRva2VuLm5hbWUoKVszXSA9PSAnZyc7Cit9CisKIHZvaWQgV2ViVlRUUGFyc2VyOjpjb25zdHJ1 Y3RUcmVlRnJvbVRva2VuKERvY3VtZW50KiBkb2N1bWVudCkKIHsKICAgICBBdG9taWNTdHJpbmcg dG9rZW5UYWdOYW1lKG1fdG9rZW4ubmFtZSgpLmRhdGEoKSwgbV90b2tlbi5uYW1lKCkuc2l6ZSgp KTsKQEAgLTM2MywxMiArMzY5LDE4IEBAIHZvaWQgV2ViVlRUUGFyc2VyOjpjb25zdHJ1Y3RUcmVl RnJvbVRva2VuKERvY3VtZW50KiBkb2N1bWVudCkKICAgICAgICAgICAgIGNoaWxkID0gV2ViVlRU RWxlbWVudDo6Y3JlYXRlKFRleHRUcmFja0N1ZTo6Y2xhc3NFbGVtZW50VGFnTmFtZSgpLCBkb2N1 bWVudCk7CiAgICAgICAgIGVsc2UgaWYgKG1fdG9rZW4ubmFtZSgpLnNpemUoKSA9PSAxICYmIG1f dG9rZW4ubmFtZSgpWzBdID09ICd2JykKICAgICAgICAgICAgIGNoaWxkID0gV2ViVlRURWxlbWVu dDo6Y3JlYXRlKFRleHRUcmFja0N1ZTo6dm9pY2VFbGVtZW50VGFnTmFtZSgpLCBkb2N1bWVudCk7 CisgICAgICAgIGVsc2UgaWYgKGlzTGFuZ1Rva2VuKG1fdG9rZW4pKQorICAgICAgICAgICAgY2hp bGQgPSBXZWJWVFRFbGVtZW50OjpjcmVhdGUoVGV4dFRyYWNrQ3VlOjpsYW5nRWxlbWVudFRhZ05h bWUoKSwgZG9jdW1lbnQpOwogCiAgICAgICAgIGlmIChjaGlsZCkgewogICAgICAgICAgICAgaWYg KG1fdG9rZW4uY2xhc3NlcygpLnNpemUoKSA+IDApCiAgICAgICAgICAgICAgICAgY2hpbGQtPnNl dEF0dHJpYnV0ZShjbGFzc0F0dHIsIEF0b21pY1N0cmluZyhtX3Rva2VuLmNsYXNzZXMoKS5kYXRh KCksIG1fdG9rZW4uY2xhc3NlcygpLnNpemUoKSkpOwogICAgICAgICAgICAgaWYgKGNoaWxkLT5o YXNUYWdOYW1lKFRleHRUcmFja0N1ZTo6dm9pY2VFbGVtZW50VGFnTmFtZSgpKSkKICAgICAgICAg ICAgICAgICBjaGlsZC0+c2V0QXR0cmlidXRlKFRleHRUcmFja0N1ZTo6dm9pY2VBdHRyaWJ1dGVO YW1lKCksIEF0b21pY1N0cmluZyhtX3Rva2VuLmFubm90YXRpb24oKS5kYXRhKCksIG1fdG9rZW4u YW5ub3RhdGlvbigpLnNpemUoKSkpOworICAgICAgICAgICAgaWYgKGNoaWxkLT5oYXNUYWdOYW1l KFRleHRUcmFja0N1ZTo6bGFuZ0VsZW1lbnRUYWdOYW1lKCkpKQorICAgICAgICAgICAgICAgIGxh bmd1YWdlU3RhY2suYXBwZW5kKEF0b21pY1N0cmluZyhtX3Rva2VuLmFubm90YXRpb24oKS5kYXRh KCksIG1fdG9rZW4uYW5ub3RhdGlvbigpLnNpemUoKSkpOworICAgICAgICAgICAgaWYgKCFsYW5n dWFnZVN0YWNrLmlzRW1wdHkoKSkKKyAgICAgICAgICAgICAgICBjaGlsZC0+c2V0QXR0cmlidXRl KFRleHRUcmFja0N1ZTo6bGFuZ0F0dHJpYnV0ZU5hbWUoKSwgbGFuZ3VhZ2VTdGFjay5sYXN0KCkp OwogICAgICAgICAgICAgbV9jdXJyZW50Tm9kZS0+cGFyc2VyQXBwZW5kQ2hpbGQoY2hpbGQpOwog ICAgICAgICAgICAgbV9jdXJyZW50Tm9kZSA9IGNoaWxkOwogICAgICAgICB9CkBAIC0zODEsNiAr MzkzLDEyIEBAIHZvaWQgV2ViVlRUUGFyc2VyOjpjb25zdHJ1Y3RUcmVlRnJvbVRva2VuKERvY3Vt ZW50KiBkb2N1bWVudCkKICAgICAgICAgICAgIGlmIChtX2N1cnJlbnROb2RlLT5wYXJlbnROb2Rl KCkpCiAgICAgICAgICAgICAgICAgbV9jdXJyZW50Tm9kZSA9IG1fY3VycmVudE5vZGUtPnBhcmVu dE5vZGUoKTsKICAgICAgICAgfQorICAgICAgICBpZiAoaXNMYW5nVG9rZW4obV90b2tlbikpIHsK KyAgICAgICAgICAgIGlmIChtX2N1cnJlbnROb2RlLT5oYXNUYWdOYW1lKFRleHRUcmFja0N1ZTo6 bGFuZ0VsZW1lbnRUYWdOYW1lKCkpKQorICAgICAgICAgICAgICAgIGxhbmd1YWdlU3RhY2sucmVt b3ZlTGFzdCgpOworICAgICAgICAgICAgaWYgKG1fY3VycmVudE5vZGUtPnBhcmVudE5vZGUoKSkK KyAgICAgICAgICAgICAgICBtX2N1cnJlbnROb2RlID0gbV9jdXJyZW50Tm9kZS0+cGFyZW50Tm9k ZSgpOworICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgV2ViVlRUVG9rZW5UeXBl czo6VGltZXN0YW1wVGFnOiB7CiAgICAgICAgIHVuc2lnbmVkIHBvc2l0aW9uID0gMDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmggYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL3RyYWNrL1dlYlZUVFBhcnNlci5oCmluZGV4IDY0OTAyMDYuLjFhNjlmMDYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuaApAQCAtMTMzLDYgKzEz Myw3IEBAIHByaXZhdGU6CiAKICAgICBXZWJWVFRQYXJzZXJDbGllbnQqIG1fY2xpZW50OwogCisg ICAgVmVjdG9yPEF0b21pY1N0cmluZz4gbGFuZ3VhZ2VTdGFjazsKICAgICBWZWN0b3I8UmVmUHRy PFRleHRUcmFja0N1ZT4gPiBtX2N1ZWxpc3Q7CiB9OwogCg== 184822 2013-01-25 15:46:06 -0800 2013-01-25 16:22:17 -0800 Proposed fix 0.2 patch text/plain 11264 dgorbik ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1MzczMWY1Li4zNmIxOGI1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMtMDEt MjUgIERpbWEgR29yYmlrICA8ZGdvcmJpa0BhcHBsZS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBs YW5ndWFnZSBXZWJWVFQgTm9kZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwNzkwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogbWVkaWEvdHJhY2svY2FwdGlvbnMtd2VidnR0L3N0eWxpbmctbGFuZy52 dHQ6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL3RyYWNrL3RyYWNrLWNzcy1tYXRjaGluZy1sYW5n LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogbWVkaWEvdHJhY2svdHJhY2stY3NzLW1h dGNoaW5nLWxhbmcuaHRtbDogQWRkZWQuCisKIDIwMTMtMDEtMjUgIEVtaWwgQSBFa2x1bmQgIDxl YWVAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgY2hyb21pdW0gc3ZnIHJlYmFz ZWxpbmUuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS90cmFjay9jYXB0aW9ucy13ZWJ2 dHQvc3R5bGluZy1sYW5nLnZ0dCBiL0xheW91dFRlc3RzL21lZGlhL3RyYWNrL2NhcHRpb25zLXdl YnZ0dC9zdHlsaW5nLWxhbmcudnR0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LjYzZWRhOTYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS90cmFjay9jYXB0 aW9ucy13ZWJ2dHQvc3R5bGluZy1sYW5nLnZ0dApAQCAtMCwwICsxLDUgQEAKK1dFQlZUVAorCisx CiswMDowMC4wMDAgLS0+IDAwOjAxLjAwMAorPGxhbmcgZW4+PGM+RW5nbGlzaDxsYW5nIHJ1Pjxj PiDQoNGD0YHRgdC60LjQuTxsYW5nIGVuPjxjPiBFbmdsaXNoIGFnYWluPC9jPjwvbGFuZz48L2M+ PC9sYW5nPjwvYz48L2xhbmc+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS90cmFjay90 cmFjay1jc3MtbWF0Y2hpbmctbGFuZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS90 cmFjay90cmFjay1jc3MtbWF0Y2hpbmctbGFuZy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMC4uYzIwODNkNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL21lZGlhL3RyYWNrL3RyYWNrLWNzcy1tYXRjaGluZy1sYW5nLWV4cGVjdGVkLnR4dApAQCAt MCwwICsxLDggQEAKK1Rlc3QgdGhhdCBjdWVzIGFyZSBiZWluZyBtYXRjaGVkIHByb3Blcmx5IGJ5 IHRoZSBsYW5nIGF0dHJpYnV0ZS4KK0VWRU5UKGNhbnBsYXl0aHJvdWdoKQorRVZFTlQoc2Vla2Vk KQorRVhQRUNURUQgKGdldENvbXB1dGVkU3R5bGUoY3VlTm9kZSkuY29sb3IgPT0gJ3JnYigwLCAx MjgsIDApJykgT0sKK0VYUEVDVEVEIChnZXRDb21wdXRlZFN0eWxlKGN1ZU5vZGUpLmNvbG9yID09 ICdyZ2IoMjU1LCAwLCAwKScpIE9LCitFWFBFQ1RFRCAoZ2V0Q29tcHV0ZWRTdHlsZShjdWVOb2Rl KS5jb2xvciA9PSAncmdiKDAsIDEyOCwgMCknKSBPSworRU5EIE9GIFRFU1QKKwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2stY3NzLW1hdGNoaW5nLWxhbmcuaHRtbCBi L0xheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWNzcy1tYXRjaGluZy1sYW5nLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODVlODRjOQotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWNzcy1tYXRjaGluZy1sYW5nLmh0bWwK QEAgLTAsMCArMSw2MCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAg ICAgICAgPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7 IGNoYXJzZXQ9dXRmLTgiIC8+CisKKyAgICAgICAgPHNjcmlwdCBzcmM9Li4vbWVkaWEtZmlsZS5q cz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Li4vdmlkZW8tdGVzdC5qcz48L3Njcmlw dD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Li4vbWVkaWEtY29udHJvbHMuanM+PC9zY3JpcHQ+CisK KyAgICAgICAgPHN0eWxlPgorICAgICAgICA6OmN1ZShjW2xhbmc9InJ1Il0pIHsgY29sb3I6IHJl ZDsgfQorICAgICAgICA6OmN1ZShjW2xhbmc9ImVuIl0pIHsgY29sb3I6IGdyZWVuOyB9CisgICAg ICAgIDwvc3R5bGU+CisKKyAgICAgICAgPHNjcmlwdD4KKworICAgICAgICB2YXIgY3VlTm9kZTsK KyAgICAgICAgdmFyIHNlZWtlZENvdW50ID0gMDsKKyAgICAgICAgdmFyIHNlZWtUaW1lcyA9IFsw LjFdOworCisgICAgICAgIHZhciBpbmZvID0gW1sicmdiKDAsIDEyOCwgMCkiLCAicmdiKDI1NSwg MCwgMCkiLCAicmdiKDAsIDEyOCwgMCkiXV07CisKKyAgICAgICAgZnVuY3Rpb24gc2Vla2VkKCkK KyAgICAgICAgeworICAgICAgICAgICAgaWYgKHRlc3RFbmRlZCkKKyAgICAgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgICAgIGN1ZU5vZGUgPSB0ZXh0VHJhY2tEaXNwbGF5RWxlbWVudCh2 aWRlbywgJ2FsbC1ub2RlcycpLmZpcnN0RWxlbWVudENoaWxkLmZpcnN0RWxlbWVudENoaWxkOwor ICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxlKGN1ZU5vZGUpLmNvbG9y IiwgaW5mb1tzZWVrZWRDb3VudF1bMF0pOworICAgICAgICAgICAgY3VlTm9kZSA9IGN1ZU5vZGUu Zmlyc3RFbGVtZW50Q2hpbGQuZmlyc3RFbGVtZW50Q2hpbGQ7CisgICAgICAgICAgICB0ZXN0RXhw ZWN0ZWQoImdldENvbXB1dGVkU3R5bGUoY3VlTm9kZSkuY29sb3IiLCBpbmZvW3NlZWtlZENvdW50 XVsxXSk7CisgICAgICAgICAgICBjdWVOb2RlID0gY3VlTm9kZS5maXJzdEVsZW1lbnRDaGlsZC5m aXJzdEVsZW1lbnRDaGlsZDsKKyAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgiZ2V0Q29tcHV0ZWRT dHlsZShjdWVOb2RlKS5jb2xvciIsIGluZm9bc2Vla2VkQ291bnRdWzJdKTsKKworICAgICAgICAg ICAgaWYgKCsrc2Vla2VkQ291bnQgPT0gaW5mby5sZW5ndGgpCisgICAgICAgICAgICAgICAgZW5k VGVzdCgpOworICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRl KCIiKTsKKyAgICAgICAgICAgICAgICBydW4oInZpZGVvLmN1cnJlbnRUaW1lID0gIiArIHNlZWtU aW1lc1tzZWVrZWRDb3VudF0pOworICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAg ZnVuY3Rpb24gbG9hZGVkKCkKKyAgICAgICAgeworICAgICAgICAgICAgY29uc29sZVdyaXRlKCJU ZXN0IHRoYXQgY3VlcyBhcmUgYmVpbmcgbWF0Y2hlZCBwcm9wZXJseSBieSB0aGUgbGFuZyBhdHRy aWJ1dGUuIik7CisgICAgICAgICAgICBmaW5kTWVkaWFFbGVtZW50KCk7CisgICAgICAgICAgICB2 aWRlby5zcmMgPSBmaW5kTWVkaWFGaWxlKCd2aWRlbycsICcuLi9jb250ZW50L3Rlc3QnKTsKKyAg ICAgICAgICAgIHZpZGVvLmlkID0gInRlc3R2aWRlbyI7CisgICAgICAgICAgICB3YWl0Rm9yRXZl bnQoJ3NlZWtlZCcsIHNlZWtlZCk7CisgICAgICAgICAgICB3YWl0Rm9yRXZlbnQoJ2NhbnBsYXl0 aHJvdWdoJywgZnVuY3Rpb24oKSB7IHZpZGVvLmN1cnJlbnRUaW1lID0gc2Vla1RpbWVzWzBdOyB9 KTsKKyAgICAgICAgfQorCisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvaGVhZD4KKyAgICA8Ym9k eSBvbmxvYWQ9ImxvYWRlZCgpIj4KKyAgICAgICAgPHZpZGVvIGNvbnRyb2xzID4KKyAgICAgICAg ICAgIDx0cmFjayBzcmM9ImNhcHRpb25zLXdlYnZ0dC9zdHlsaW5nLWxhbmcudnR0IiBraW5kPSJj YXB0aW9ucyIgZGVmYXVsdD4KKyAgICAgICAgPC92aWRlbz4KKyAgICA8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggOTY1OTQ5Mi4uZDNmYTRhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDEzLTAxLTI1ICBEaW1hIEdvcmJpayAgPGRnb3JiaWtAYXBwbGUuY29tPgorCisgICAg ICAgIFN1cHBvcnQgbGFuZ3VhZ2UgV2ViVlRUIE5vZGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDc5MDcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMYW5ndWFnZSBzdGFjayBhbmQgV2ViVlRUIGxhbmd1 YWdlIG5vZGVzIGFyZSBhZGRlZCBhcyAKKyAgICAgICAgcmVxdWlyZWQgYnkgc3BlY3MuCisKKyAg ICAgICAgVGVzdDogbWVkaWEvdHJhY2svdHJhY2stY3NzLW1hdGNoaW5nLWxhbmcuaHRtbAorCisg ICAgICAgICogaHRtbC90cmFjay9UZXh0VHJhY2tDdWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 VGV4dFRyYWNrQ3VlOjpjb3B5V2ViVlRUTm9kZVRvRE9NVHJlZSk6IFdlYlZUVCBsYW5ndWFnZSBu b2RlcyBzaG91bGQgYmUKKyAgICAgICAgc3BhbnMgaW4gRE9NIGFuZCB0aGUgbGFuZyBhdHRyaWJ1 dGUgc2hvdWxkIGJlIHNldCBmb3IgYWxsIG5vZGVzIGlmIGFwcGxpY2FibGUuCisgICAgICAgICog aHRtbC90cmFjay9UZXh0VHJhY2tDdWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFja0N1 ZTo6bGFuZ0VsZW1lbnRUYWdOYW1lKToKKyAgICAgICAgKFRleHRUcmFja0N1ZSk6CisgICAgICAg IChXZWJDb3JlOjpUZXh0VHJhY2tDdWU6OmxhbmdBdHRyaWJ1dGVOYW1lKToKKyAgICAgICAgKiBo dG1sL3RyYWNrL1dlYlZUVFBhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJWVFRQYXJz ZXI6OmNyZWF0ZURvY3VtZW50RnJhZ21lbnRGcm9tQ3VlVGV4dCk6IGNsZWFyIHRoZSBsYW5ndWFn ZSBzdGFjayBpbiBjYXNlCisgICAgICAgIHdlIHVzZSB0aGUgc2FtZSBwYXJzZXIgb2JqZWN0IGZv ciBtdWx0aXBsZSBjdWVzIHRoYXQgaGF2ZSBpbmNvcnJlY3Qgc3ludGF4LgorICAgICAgICAoV2Vi Q29yZTo6aXNMYW5nVG9rZW4pOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3Jl OjpXZWJWVFRQYXJzZXI6OmNvbnN0cnVjdFRyZWVGcm9tVG9rZW4pOiBwYXJzZSBsYW5nIFdlYlZU VCBvYmplY3RzLgorICAgICAgICAqIGh0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmg6CisgICAgICAg IChXZWJWVFRQYXJzZXIpOgorCiAyMDEzLTAxLTI1ICBBbGV4YW5kcmUgRWxpYXMgIDxhZWxpYXNA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIENhbGwgRnJhbWVWaWV3Ojpjb250ZW50c1Jlc2l6ZWQo KSB3aGVuIHNldHRpbmcgZml4ZWQgbGF5b3V0IHNpemUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJh Y2svVGV4dFRyYWNrQ3VlLmNwcAppbmRleCAzODQ1YTc0Li4yZjFhMDc5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWUuY3BwCkBAIC01MDQsMTAgKzUwNCwxMSBAQCB2 b2lkIFRleHRUcmFja0N1ZTo6Y29weVdlYlZUVE5vZGVUb0RPTVRyZWUoQ29udGFpbmVyTm9kZSog d2ViVlRUTm9kZSwgQ29udGFpbmVyTgogICAgIGZvciAoTm9kZSogbm9kZSA9IHdlYlZUVE5vZGUt PmZpcnN0Q2hpbGQoKTsgbm9kZTsgbm9kZSA9IG5vZGUtPm5leHRTaWJsaW5nKCkpIHsKICAgICAg ICAgUmVmUHRyPE5vZGU+IGNsb25lZE5vZGU7CiAgICAgICAgIC8vIFNwZWNzIHJlcXVpcmUgdm9p Y2UgYW5kIGNsYXNzIFdlYlZUVCBlbGVtZW50cyB0byBiZSBzcGFucyBmb3IgRE9NIHRyZWVzLgot ICAgICAgICBpZiAobm9kZS0+aGFzVGFnTmFtZSh2b2ljZUVsZW1lbnRUYWdOYW1lKCkpIHx8IG5v ZGUtPmhhc1RhZ05hbWUoY2xhc3NFbGVtZW50VGFnTmFtZSgpKSkgeworICAgICAgICBpZiAobm9k ZS0+aGFzVGFnTmFtZSh2b2ljZUVsZW1lbnRUYWdOYW1lKCkpIHx8IG5vZGUtPmhhc1RhZ05hbWUo Y2xhc3NFbGVtZW50VGFnTmFtZSgpKSB8fCBub2RlLT5oYXNUYWdOYW1lKGxhbmdFbGVtZW50VGFn TmFtZSgpKSkgewogICAgICAgICAgICAgY2xvbmVkTm9kZSA9IEhUTUxTcGFuRWxlbWVudDo6Y3Jl YXRlKHNwYW5UYWcsIHN0YXRpY19jYXN0PERvY3VtZW50Kj4obV9zY3JpcHRFeGVjdXRpb25Db250 ZXh0KSk7CiAgICAgICAgICAgICB0b0VsZW1lbnQoY2xvbmVkTm9kZS5nZXQoKSktPnNldEF0dHJp YnV0ZShjbGFzc0F0dHIsIHRvRWxlbWVudChub2RlKS0+Z2V0QXR0cmlidXRlKGNsYXNzQXR0cikp OwogICAgICAgICAgICAgdG9FbGVtZW50KGNsb25lZE5vZGUuZ2V0KCkpLT5zZXRBdHRyaWJ1dGUo dGl0bGVBdHRyLCB0b0VsZW1lbnQobm9kZSktPmdldEF0dHJpYnV0ZSh2b2ljZUF0dHJpYnV0ZU5h bWUoKSkpOworICAgICAgICAgICAgdG9FbGVtZW50KGNsb25lZE5vZGUuZ2V0KCkpLT5zZXRBdHRy aWJ1dGUobGFuZ0F0dHIsIHRvRWxlbWVudChub2RlKS0+Z2V0QXR0cmlidXRlKGxhbmdBdHRyaWJ1 dGVOYW1lKCkpKTsKICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBjbG9uZWROb2RlID0gbm9k ZS0+Y2xvbmVOb2RlKGZhbHNlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC90 cmFjay9UZXh0VHJhY2tDdWUuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNr Q3VlLmgKaW5kZXggY2MxNmYwNy4uMjg3YWJlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC90cmFjay9UZXh0VHJhY2tDdWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNr L1RleHRUcmFja0N1ZS5oCkBAIC04NSw2ICs4NSwxMiBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVy biBjdWU7CiAgICAgfQogCisgICAgc3RhdGljIGNvbnN0IFF1YWxpZmllZE5hbWUmIGxhbmdFbGVt ZW50VGFnTmFtZSgpCisgICAgeworICAgICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFF1YWxpZmll ZE5hbWUsIGxhbmdUYWcsIChudWxsQXRvbSwgImxhbmciLCBudWxsQXRvbSkpOworICAgICAgICBy ZXR1cm4gbGFuZ1RhZzsKKyAgICB9CisKICAgICBzdGF0aWMgY29uc3QgUXVhbGlmaWVkTmFtZSYg dm9pY2VFbGVtZW50VGFnTmFtZSgpCiAgICAgewogICAgICAgICBERUZJTkVfU1RBVElDX0xPQ0FM KFF1YWxpZmllZE5hbWUsIHZUYWcsIChudWxsQXRvbSwgInYiLCBudWxsQXRvbSkpOwpAQCAtOTYs MTMgKzEwMiwxOSBAQCBwdWJsaWM6CiAgICAgICAgIERFRklORV9TVEFUSUNfTE9DQUwoUXVhbGlm aWVkTmFtZSwgY1RhZywgKG51bGxBdG9tLCAiYyIsIG51bGxBdG9tKSk7CiAgICAgICAgIHJldHVy biBjVGFnOwogICAgIH0KLSAgICAKKwogICAgIHN0YXRpYyBjb25zdCBRdWFsaWZpZWROYW1lJiB2 b2ljZUF0dHJpYnV0ZU5hbWUoKQogICAgIHsKICAgICAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChR dWFsaWZpZWROYW1lLCB2b2ljZUF0dHIsIChudWxsQXRvbSwgInZvaWNlIiwgbnVsbEF0b20pKTsK ICAgICAgICAgcmV0dXJuIHZvaWNlQXR0cjsKICAgICB9CiAKKyAgICBzdGF0aWMgY29uc3QgUXVh bGlmaWVkTmFtZSYgbGFuZ0F0dHJpYnV0ZU5hbWUoKQorICAgIHsKKyAgICAgICAgREVGSU5FX1NU QVRJQ19MT0NBTChRdWFsaWZpZWROYW1lLCB2b2ljZUF0dHIsIChudWxsQXRvbSwgImxhbmciLCBu dWxsQXRvbSkpOworICAgICAgICByZXR1cm4gdm9pY2VBdHRyOworICAgIH0KKwogICAgIHZpcnR1 YWwgflRleHRUcmFja0N1ZSgpOwogCiAgICAgc3RhdGljIGNvbnN0IEF0b21pY1N0cmluZyYgYWxs Tm9kZXNTaGFkb3dQc2V1ZG9JZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC90 cmFjay9XZWJWVFRQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9XZWJWVFRQ YXJzZXIuY3BwCmluZGV4IDQxZTU0OWUuLjZhMThjMGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L3RyYWNrL1dlYlZUVFBhcnNlci5jcHAKQEAgLTI1MSw2ICsyNTEsNyBAQCBQYXNzUmVmUHRyPERv Y3VtZW50RnJhZ21lbnQ+ICBXZWJWVFRQYXJzZXI6OmNyZWF0ZURvY3VtZW50RnJhZ21lbnRGcm9t Q3VlVGV4dChjbwogICAgIG1fdG9rZW5pemVyLT5yZXNldCgpOwogICAgIG1fdG9rZW4uY2xlYXIo KTsKICAgICAKKyAgICBtX2xhbmd1YWdlU3RhY2suY2xlYXIoKTsKICAgICBTZWdtZW50ZWRTdHJp bmcgY29udGVudCh0ZXh0KTsKICAgICB3aGlsZSAobV90b2tlbml6ZXItPm5leHRUb2tlbihjb250 ZW50LCBtX3Rva2VuKSkKICAgICAgICAgY29uc3RydWN0VHJlZUZyb21Ub2tlbihkb2N1bWVudCk7 CkBAIC0zNDEsNiArMzQyLDExIEBAIGRvdWJsZSBXZWJWVFRQYXJzZXI6OmNvbGxlY3RUaW1lU3Rh bXAoY29uc3QgU3RyaW5nJiBsaW5lLCB1bnNpZ25lZCogcG9zaXRpb24pCiAgICAgcmV0dXJuICh2 YWx1ZTEgKiBzZWNvbmRzUGVySG91cikgKyAodmFsdWUyICogc2Vjb25kc1Blck1pbnV0ZSkgKyB2 YWx1ZTMgKyAodmFsdWU0ICogc2Vjb25kc1Blck1pbGxpc2Vjb25kKTsKIH0KIAorc3RhdGljIGlu bGluZSBib29sIGlzTGFuZ1Rva2VuKFdlYlZUVFRva2VuJiB0b2tlbikKK3sKKyAgICByZXR1cm4g dG9rZW4ubmFtZSgpLnNpemUoKSA9PSA0ICYmIHRva2VuLm5hbWUoKVswXSA9PSAnbCcgJiYgdG9r ZW4ubmFtZSgpWzFdID09ICdhJyAmJiB0b2tlbi5uYW1lKClbMl0gPT0gJ24nICYmIHRva2VuLm5h bWUoKVszXSA9PSAnZyc7Cit9CisKIHZvaWQgV2ViVlRUUGFyc2VyOjpjb25zdHJ1Y3RUcmVlRnJv bVRva2VuKERvY3VtZW50KiBkb2N1bWVudCkKIHsKICAgICBBdG9taWNTdHJpbmcgdG9rZW5UYWdO YW1lKG1fdG9rZW4ubmFtZSgpLmRhdGEoKSwgbV90b2tlbi5uYW1lKCkuc2l6ZSgpKTsKQEAgLTM2 MywxMiArMzY5LDE4IEBAIHZvaWQgV2ViVlRUUGFyc2VyOjpjb25zdHJ1Y3RUcmVlRnJvbVRva2Vu KERvY3VtZW50KiBkb2N1bWVudCkKICAgICAgICAgICAgIGNoaWxkID0gV2ViVlRURWxlbWVudDo6 Y3JlYXRlKFRleHRUcmFja0N1ZTo6Y2xhc3NFbGVtZW50VGFnTmFtZSgpLCBkb2N1bWVudCk7CiAg ICAgICAgIGVsc2UgaWYgKG1fdG9rZW4ubmFtZSgpLnNpemUoKSA9PSAxICYmIG1fdG9rZW4ubmFt ZSgpWzBdID09ICd2JykKICAgICAgICAgICAgIGNoaWxkID0gV2ViVlRURWxlbWVudDo6Y3JlYXRl KFRleHRUcmFja0N1ZTo6dm9pY2VFbGVtZW50VGFnTmFtZSgpLCBkb2N1bWVudCk7CisgICAgICAg IGVsc2UgaWYgKGlzTGFuZ1Rva2VuKG1fdG9rZW4pKQorICAgICAgICAgICAgY2hpbGQgPSBXZWJW VFRFbGVtZW50OjpjcmVhdGUoVGV4dFRyYWNrQ3VlOjpsYW5nRWxlbWVudFRhZ05hbWUoKSwgZG9j dW1lbnQpOwogCiAgICAgICAgIGlmIChjaGlsZCkgewogICAgICAgICAgICAgaWYgKG1fdG9rZW4u Y2xhc3NlcygpLnNpemUoKSA+IDApCiAgICAgICAgICAgICAgICAgY2hpbGQtPnNldEF0dHJpYnV0 ZShjbGFzc0F0dHIsIEF0b21pY1N0cmluZyhtX3Rva2VuLmNsYXNzZXMoKS5kYXRhKCksIG1fdG9r ZW4uY2xhc3NlcygpLnNpemUoKSkpOwogICAgICAgICAgICAgaWYgKGNoaWxkLT5oYXNUYWdOYW1l KFRleHRUcmFja0N1ZTo6dm9pY2VFbGVtZW50VGFnTmFtZSgpKSkKICAgICAgICAgICAgICAgICBj aGlsZC0+c2V0QXR0cmlidXRlKFRleHRUcmFja0N1ZTo6dm9pY2VBdHRyaWJ1dGVOYW1lKCksIEF0 b21pY1N0cmluZyhtX3Rva2VuLmFubm90YXRpb24oKS5kYXRhKCksIG1fdG9rZW4uYW5ub3RhdGlv bigpLnNpemUoKSkpOworICAgICAgICAgICAgaWYgKGNoaWxkLT5oYXNUYWdOYW1lKFRleHRUcmFj a0N1ZTo6bGFuZ0VsZW1lbnRUYWdOYW1lKCkpKQorICAgICAgICAgICAgICAgIG1fbGFuZ3VhZ2VT dGFjay5hcHBlbmQoQXRvbWljU3RyaW5nKG1fdG9rZW4uYW5ub3RhdGlvbigpLmRhdGEoKSwgbV90 b2tlbi5hbm5vdGF0aW9uKCkuc2l6ZSgpKSk7CisgICAgICAgICAgICBpZiAoIW1fbGFuZ3VhZ2VT dGFjay5pc0VtcHR5KCkpCisgICAgICAgICAgICAgICAgY2hpbGQtPnNldEF0dHJpYnV0ZShUZXh0 VHJhY2tDdWU6OmxhbmdBdHRyaWJ1dGVOYW1lKCksIG1fbGFuZ3VhZ2VTdGFjay5sYXN0KCkpOwog ICAgICAgICAgICAgbV9jdXJyZW50Tm9kZS0+cGFyc2VyQXBwZW5kQ2hpbGQoY2hpbGQpOwogICAg ICAgICAgICAgbV9jdXJyZW50Tm9kZSA9IGNoaWxkOwogICAgICAgICB9CkBAIC0zODEsNiArMzkz LDEyIEBAIHZvaWQgV2ViVlRUUGFyc2VyOjpjb25zdHJ1Y3RUcmVlRnJvbVRva2VuKERvY3VtZW50 KiBkb2N1bWVudCkKICAgICAgICAgICAgIGlmIChtX2N1cnJlbnROb2RlLT5wYXJlbnROb2RlKCkp CiAgICAgICAgICAgICAgICAgbV9jdXJyZW50Tm9kZSA9IG1fY3VycmVudE5vZGUtPnBhcmVudE5v ZGUoKTsKICAgICAgICAgfQorICAgICAgICBpZiAoaXNMYW5nVG9rZW4obV90b2tlbikpIHsKKyAg ICAgICAgICAgIGlmIChtX2N1cnJlbnROb2RlLT5oYXNUYWdOYW1lKFRleHRUcmFja0N1ZTo6bGFu Z0VsZW1lbnRUYWdOYW1lKCkpKQorICAgICAgICAgICAgICAgIG1fbGFuZ3VhZ2VTdGFjay5yZW1v dmVMYXN0KCk7CisgICAgICAgICAgICBpZiAobV9jdXJyZW50Tm9kZS0+cGFyZW50Tm9kZSgpKQor ICAgICAgICAgICAgICAgIG1fY3VycmVudE5vZGUgPSBtX2N1cnJlbnROb2RlLT5wYXJlbnROb2Rl KCk7CisgICAgICAgIH0KICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJWVFRUb2tlblR5cGVz OjpUaW1lc3RhbXBUYWc6IHsKICAgICAgICAgdW5zaWduZWQgcG9zaXRpb24gPSAwOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmgKaW5kZXggNjQ5MDIwNi4uYzUwYzMwNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1dlYlZUVFBhcnNlci5oCkBAIC0xMzMsNiArMTMz LDcgQEAgcHJpdmF0ZToKIAogICAgIFdlYlZUVFBhcnNlckNsaWVudCogbV9jbGllbnQ7CiAKKyAg ICBWZWN0b3I8QXRvbWljU3RyaW5nPiBtX2xhbmd1YWdlU3RhY2s7CiAgICAgVmVjdG9yPFJlZlB0 cjxUZXh0VHJhY2tDdWU+ID4gbV9jdWVsaXN0OwogfTsKIAo=