86308 2012-05-12 17:33:16 -0700 <video> won't load when URL ends with .php 2021-02-10 16:32:35 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=221695 InRadar P2 Normal --- 1 eric.carlson eric.carlson ap beidson dglazkov feature-media-reviews webkit-bug-importer webkit.review.bot oldest_to_newest 622432 0 eric.carlson 2012-05-12 17:33:16 -0700 A media file that does not provide MIME a type in the markup, eg. does not use <source type=...>, will not load if the url has a non-media file extension for which MIMETypeRegistry::getMediaMIMETypeForExtension() returns a type. This is caused by the changes in http://trac.webkit.org/changeset/102800 in many cases because we now correctly extract the file extension from query urls. 622433 1 eric.carlson 2012-05-12 17:33:50 -0700 <rdar://problem/10904486> 622434 2 webkit-bug-importer 2012-05-12 17:34:08 -0700 <rdar://problem/11441432> 622435 3 141590 eric.carlson 2012-05-12 18:06:00 -0700 Created attachment 141590 Proposed patch 622437 4 141590 webkit-ews 2012-05-12 18:10:45 -0700 Comment on attachment 141590 Proposed patch Attachment 141590 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12679123 622438 5 141590 webkit-ews 2012-05-12 18:10:58 -0700 Comment on attachment 141590 Proposed patch Attachment 141590 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/12678503 622439 6 141590 buildbot 2012-05-12 18:27:26 -0700 Comment on attachment 141590 Proposed patch Attachment 141590 did not pass win-ews (win): Output: http://queues.webkit.org/results/12666923 622477 7 141600 eric.carlson 2012-05-12 23:04:39 -0700 Created attachment 141600 Updated patch - this time with not as many uninitialized variables. 622561 8 141600 darin 2012-05-13 16:19:26 -0700 Comment on attachment 141600 Updated patch - this time with not as many uninitialized variables. View in context: https://bugs.webkit.org/attachment.cgi?id=141600&action=review > Source/WebCore/platform/graphics/MediaPlayer.cpp:328 > + , m_typeInferredFromExtension(false) This variable name sounds like it would be a type, not a boolean. m_typeWasInferredFromExtension should like a boolean. Or for additional clarity, m_contentMIMETypeWasInferredFromExtension. > Source/WebCore/platform/graphics/MediaPlayer.cpp:354 > + m_typeInferredFromExtension = false; Seems strange that for m_url, m_contentMIMEType, and m_contentTypeCodecs we use local variables and set the data member only at the end, but for m_typeInferredFromExtension we set the data member directly. The code would be easier to read if all worked the same way. > Source/WebCore/platform/graphics/MediaPlayer.cpp:369 > String mediaType = MIMETypeRegistry::getMediaMIMETypeForExtension(extension); > - if (!mediaType.isEmpty()) > + if (!mediaType.isEmpty()) { > type = mediaType; > + m_typeInferredFromExtension = true; > + } Seems like for clarity mediaType could be named inferredType. 623079 9 eric.carlson 2012-05-14 10:25:07 -0700 (In reply to comment #8) > (From update of attachment 141600 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=141600&action=review > > > Source/WebCore/platform/graphics/MediaPlayer.cpp:328 > > + , m_typeInferredFromExtension(false) > > This variable name sounds like it would be a type, not a boolean. m_typeWasInferredFromExtension should like a boolean. Or for additional clarity, m_contentMIMETypeWasInferredFromExtension. > Done. > > Source/WebCore/platform/graphics/MediaPlayer.cpp:354 > > + m_typeInferredFromExtension = false; > > Seems strange that for m_url, m_contentMIMEType, and m_contentTypeCodecs we use local variables and set the data member only at the end, but for m_typeInferredFromExtension we set the data member directly. The code would be easier to read if all worked the same way. > Done. > > Source/WebCore/platform/graphics/MediaPlayer.cpp:369 > > String mediaType = MIMETypeRegistry::getMediaMIMETypeForExtension(extension); > > - if (!mediaType.isEmpty()) > > + if (!mediaType.isEmpty()) { > > type = mediaType; > > + m_typeInferredFromExtension = true; > > + } > > Seems like for clarity mediaType could be named inferredType. Excellent point, but I forgot to fix this before checking it in. I will clean this up the next time I modify this file. 623080 10 eric.carlson 2012-05-14 10:25:20 -0700 http://trac.webkit.org/changeset/116960 624560 11 beidson 2012-05-15 14:25:43 -0700 (In reply to comment #10) > http://trac.webkit.org/changeset/116960 The test checked in with this change fails on Lion. http://build.webkit.org/results/Lion%20Debug%20(Tests)/r116960%20(6573)/http/tests/media/video-query-url-pretty-diff.html https://bugs.webkit.org/show_bug.cgi?id=86527 tracks this. 141590 2012-05-12 18:06:00 -0700 2012-05-12 23:04:39 -0700 Proposed patch patch_1.txt text/plain 7147 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNjg2MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTEyICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIDx2aWRlbz4gd29uJ3Qg bG9hZCB3aGVuIFVSTCBlbmRzIHdpdGggLnBocAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODYzMDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUZXN0OiBodHRwL3Rlc3RzL21lZGlhL3ZpZGVvLXF1ZXJ5LXVy bC5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllcjo6TWVkaWFQbGF5ZXIpOiBJbml0aWFsaXplIG1f dHlwZUluZmVycmVkRnJvbUV4dGVuc2lvbi4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy Ojpsb2FkKTogU2V0IG1fdHlwZUluZmVycmVkRnJvbUV4dGVuc2lvbiBhcHByb3ByaWF0ZWx5Lgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXI6OmxvYWRXaXRoTmV4dE1lZGlhRW5naW5lKTog SWYgd2UgZG9uJ3QgZmluZCBhIG1lZGlhIGVuZ2luZSByZWdpc3RlcmVkCisgICAgICAgICAgICBm b3IgYSBNSU1FIHR5cGUsIGFuZCB0aGUgdHlwZSB3YXMgaW5mZXJyZWQgZnJvbSB0aGUgZXh0ZW5z aW9uLCBnaXZlIHRoZSBmaXJzdCByZWdpc3RlcmVkCisgICAgICAgICAgICBtZWRpYSBlbmdpbmUg YSBjaGFuY2UgYW53eWF5IGp1c3QgYXMgd2UgZG8gd2hlbiB0aGVyZSBpcyBubyBNSU1FIHR5cGUg YXQgYWxsLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmg6IEFkZCBt X3R5cGVJbmZlcnJlZEZyb21FeHRlbnNpb24uCisKIDIwMTItMDUtMTIgIFBoaWxpcCBSb2dlcnMg IDxwZHJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBDbGVhbnVwIGJlZm9yZSBjaGFuZ2luZyBhdHRy aWJ1dGVOYW1lIGluIFNWRyA8YW5pbWF0ZT4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAJKHJldmlzaW9uIDExNDUyMSkKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMzI1LDYgKzMyNSw3IEBAIE1lZGlhUGxheWVyOjpNZWRpYVBsYXllcihNZWRpYVBs YXllckNsaWUKICAgICAsIG1fcHJlc2VydmVzUGl0Y2godHJ1ZSkKICAgICAsIG1fcHJpdmF0ZUJy b3dzaW5nKGZhbHNlKQogICAgICwgbV9zaG91bGRQcmVwYXJlVG9SZW5kZXIoZmFsc2UpCisgICAg LCBtX3R5cGVJbmZlcnJlZEZyb21FeHRlbnNpb24oZmFsc2UpCiAjaWYgRU5BQkxFKFBMVUdJTl9Q Uk9YWV9GT1JfVklERU8pCiAgICAgLCBtX3BsYXllclByb3h5KDApCiAjZW5kaWYKQEAgLTM1MCw2 ICszNTEsNyBAQCBib29sIE1lZGlhUGxheWVyOjpsb2FkKGNvbnN0IEtVUkwmIHVybCwgCiAgICAg U3RyaW5nIHR5cGUgPSBjb250ZW50VHlwZS50eXBlKCkubG93ZXIoKTsKICAgICBTdHJpbmcgdHlw ZUNvZGVjcyA9IGNvbnRlbnRUeXBlLnBhcmFtZXRlcihjb2RlY3MoKSk7CiAgICAgU3RyaW5nIHVy bFN0cmluZyA9IHVybC5zdHJpbmcoKTsKKyAgICBtX3R5cGVJbmZlcnJlZEZyb21FeHRlbnNpb24g PSBmYWxzZTsKIAogICAgIC8vIElmIHRoZSBNSU1FIHR5cGUgaXMgbWlzc2luZyBvciBpcyBub3Qg bWVhbmluZ2Z1bCwgdHJ5IHRvIGZpZ3VyZSBpdCBvdXQgZnJvbSB0aGUgVVJMLgogICAgIGlmICh0 eXBlLmlzRW1wdHkoKSB8fCB0eXBlID09IGFwcGxpY2F0aW9uT2N0ZXRTdHJlYW0oKSB8fCB0eXBl ID09IHRleHRQbGFpbigpKSB7CkBAIC0zNjEsOCArMzYzLDEwIEBAIGJvb2wgTWVkaWFQbGF5ZXI6 OmxvYWQoY29uc3QgS1VSTCYgdXJsLCAKICAgICAgICAgICAgIGlmIChwb3MgIT0gbm90Rm91bmQp IHsKICAgICAgICAgICAgICAgICBTdHJpbmcgZXh0ZW5zaW9uID0gbGFzdFBhdGhDb21wb25lbnQu c3Vic3RyaW5nKHBvcyArIDEpOwogICAgICAgICAgICAgICAgIFN0cmluZyBtZWRpYVR5cGUgPSBN SU1FVHlwZVJlZ2lzdHJ5OjpnZXRNZWRpYU1JTUVUeXBlRm9yRXh0ZW5zaW9uKGV4dGVuc2lvbik7 Ci0gICAgICAgICAgICAgICAgaWYgKCFtZWRpYVR5cGUuaXNFbXB0eSgpKQorICAgICAgICAgICAg ICAgIGlmICghbWVkaWFUeXBlLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgICAgICAgICB0eXBl ID0gbWVkaWFUeXBlOworICAgICAgICAgICAgICAgICAgICBtX3R5cGVJbmZlcnJlZEZyb21FeHRl bnNpb24gPSB0cnVlOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAg fQogICAgIH0KQEAgLTM3OSwxMiArMzgzLDEzIEBAIHZvaWQgTWVkaWFQbGF5ZXI6OmxvYWRXaXRo TmV4dE1lZGlhRW5naW4KIHsKICAgICBNZWRpYVBsYXllckZhY3RvcnkqIGVuZ2luZTsKIAotICAg IC8vIElmIG5vIE1JTUUgdHlwZSBpcyBzcGVjaWZpZWQsIGp1c3QgdXNlIHRoZSBuZXh0IGVuZ2lu ZS4KLSAgICBpZiAobV9jb250ZW50TUlNRVR5cGUuaXNFbXB0eSgpKQotICAgICAgICBlbmdpbmUg PSBuZXh0TWVkaWFFbmdpbmUoY3VycmVudCk7Ci0gICAgZWxzZQorICAgIGlmICghbV9jb250ZW50 TUlNRVR5cGUuaXNFbXB0eSgpKQogICAgICAgICBlbmdpbmUgPSBiZXN0TWVkaWFFbmdpbmVGb3JU eXBlQW5kQ29kZWNzKG1fY29udGVudE1JTUVUeXBlLCBtX2NvbnRlbnRUeXBlQ29kZWNzLCBtX2tl eVN5c3RlbSwgY3VycmVudCk7CiAKKyAgICAvLyBJZiBubyBNSU1FIHR5cGUgaXMgc3BlY2lmaWVk IG9yIHRoZSB0eXBlIHdhcyBpbmZlcnJlZCBmcm9tIHRoZSBmaWxlIGV4dGVuc2lvbiwganVzdCB1 c2UgdGhlIG5leHQgZW5naW5lLgorICAgIGlmICghZW5naW5lICYmIChtX2NvbnRlbnRNSU1FVHlw ZS5pc0VtcHR5KCkgfHwgbV90eXBlSW5mZXJyZWRGcm9tRXh0ZW5zaW9uKSkKKyAgICAgICAgZW5n aW5lID0gbmV4dE1lZGlhRW5naW5lKGN1cnJlbnQpOworCiAgICAgLy8gRG9uJ3QgZGVsZXRlIGFu ZCByZWNyZWF0ZSB0aGUgcGxheWVyIHVubGVzcyBpdCBjb21lcyBmcm9tIGEgZGlmZmVyZW50IGVu Z2luZS4KICAgICBpZiAoIWVuZ2luZSkgewogICAgICAgICBMT0coTWVkaWEsICJNZWRpYVBsYXll cjo6bG9hZFdpdGhOZXh0TWVkaWFFbmdpbmUgLSBubyBtZWRpYSBlbmdpbmUgZm91bmQgZm9yIHR5 cGUgXCIlc1wiIiwgbV9jb250ZW50TUlNRVR5cGUudXRmOCgpLmRhdGEoKSk7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgJKHJldmlzaW9u IDExNDUyMSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVy LmgJKHdvcmtpbmcgY29weSkKQEAgLTM5Miw2ICszOTIsNyBAQCBwcml2YXRlOgogICAgIGJvb2wg bV9wcmVzZXJ2ZXNQaXRjaDsKICAgICBib29sIG1fcHJpdmF0ZUJyb3dzaW5nOwogICAgIGJvb2wg bV9zaG91bGRQcmVwYXJlVG9SZW5kZXI7CisgICAgYm9vbCBtX3R5cGVJbmZlcnJlZEZyb21FeHRl bnNpb247CiAjaWYgRU5BQkxFKFBMVUdJTl9QUk9YWV9GT1JfVklERU8pCiAgICAgV2ViTWVkaWFQ bGF5ZXJQcm94eSogbV9wbGF5ZXJQcm94eTsgICAgLy8gbm90IG93bmVkIG9yIHVzZWQsIHBhc3Nl ZCB0byBtX3ByaXZhdGUKICNlbmRpZgpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTE2ODYxKQorKysgTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTIt MDUtMTIgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAg PHZpZGVvPiB3b24ndCBsb2FkIHdoZW4gVVJMIGVuZHMgd2l0aCAucGhwCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjMwOAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0cy9tZWRpYS9yZXNv dXJjZXMvbG9hZC12aWRlby5waHA6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvbWVkaWEv dmlkZW8tcXVlcnktdXJsLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0 cy9tZWRpYS92aWRlby1xdWVyeS11cmwuaHRtbDogQWRkZWQuCisKIDIwMTItMDUtMTIgIFBoaWxp cCBSb2dlcnMgIDxwZHJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBDbGVhbnVwIGJlZm9yZSBjaGFu Z2luZyBhdHRyaWJ1dGVOYW1lIGluIFNWRyA8YW5pbWF0ZT4KSW5kZXg6IExheW91dFRlc3RzL2h0 dHAvdGVzdHMvbWVkaWEvdmlkZW8tcXVlcnktdXJsLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3ZpZGVvLXF1ZXJ5LXVybC1leHBlY3RlZC50 eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3ZpZGVvLXF1 ZXJ5LXVybC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNSBAQAorIAorVGVz dHMgdGhhdCBXZWJLaXQgaXMgYWJsZSB0byBvcGVuIGEgbWVkaWEgZmlsZSBzcGVjaWZpZWQgd2l0 aCBhIHF1ZXJ5IHVybC4gIAorRVZFTlQoY2FucGxheSkKK0VORCBPRiBURVNUCisKSW5kZXg6IExh eW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvdmlkZW8tcXVlcnktdXJsLmh0bWwKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS92aWRlby1xdWVyeS11cmwuaHRtbAko cmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvdmlkZW8tcXVlcnkt dXJsLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMzQgQEAKKzxodG1sPgorICAgIDxoZWFk PgorICAgICAgICA8c2NyaXB0IHNyYz0uLi8uLi9tZWRpYS1yZXNvdXJjZXMvdmlkZW8tdGVzdC5q cz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Li4vLi4vbWVkaWEtcmVzb3VyY2VzL21l ZGlhLWZpbGUuanM+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQ+CisgICAgICAgICAgICBmdW5j dGlvbiBsb2FkTWVkaWFGcmFtZSgpIAorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGZp bmRNZWRpYUVsZW1lbnQoKTsKKworICAgICAgICAgICAgICAgIHZhciBtb3ZpZSA9IGZpbmRNZWRp YUZpbGUoJ3ZpZGVvJywgJ3Rlc3QnKTsKKyAgICAgICAgICAgICAgICB2YXIgdHlwZSA9IG1pbWVU eXBlRm9yRXh0ZW5zaW9uKG1vdmllLnNwbGl0KCcuJykucG9wKCkpOworICAgICAgICAgICAgICAg IHZhciBmcmFtZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2lmcmFtZScpOworCisgICAgICAg ICAgICAgICAgZnJhbWUud2lkdGggPSAwOworICAgICAgICAgICAgICAgIGZyYW1lLmhlaWdodCA9 IDA7CisgICAgICAgICAgICAgICAgZnJhbWUuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIGZ1bmN0 aW9uICgpIHsKKyAgICAgICAgICAgICAgICAgICAgdmlkZW8uc3JjID0gJ2h0dHA6Ly8xMjcuMC4w LjE6ODAwMC9tZWRpYS9yZXNvdXJjZXMvbG9hZC12aWRlby5waHA/bmFtZT0nICsgbW92aWUgKyAn JnR5cGU9JyArIHR5cGU7CisgICAgCisgICAgICAgICAgICAgICAgICAgIHdhaXRGb3JFdmVudEFu ZEZhaWwoJ2Vycm9yJyk7CisgICAgICAgICAgICAgICAgICAgIHdhaXRGb3JFdmVudEFuZEVuZCgn Y2FucGxheScpOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICAKKyAgICAgICAgICAgICAg ICBmcmFtZS5zcmMgPSAiZGF0YTp0ZXh0L2h0bWwsPGI+dGVzdDwvYj4iOworICAgICAgICAgICAg ICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoZnJhbWUpOworICAgICAgICAgICAgfQorICAg ICAgICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisKKyAgICA8Ym9keSBvbmxvYWQ9ImxvYWRNZWRp YUZyYW1lKCkiPgorICAgICAgICA8dmlkZW8gY29udHJvbHM+PC92aWRlbz4KKyAgICAgICAgPGJy PgorICAgICAgICBUZXN0cyB0aGF0IFdlYktpdCBpcyBhYmxlIHRvIG9wZW4gYSBtZWRpYSBmaWxl IHNwZWNpZmllZCB3aXRoIGEgcXVlcnkgdXJsLgorICAgIDwvYm9keT4KKzwvaHRtbD4KSW5kZXg6 IExheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvcmVzb3VyY2VzL2xvYWQtdmlkZW8ucGhwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvcmVzb3VyY2VzL2xvYWQt dmlkZW8ucGhwCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9y ZXNvdXJjZXMvbG9hZC12aWRlby5waHAJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTEgQEAKKzw/ cGhwCisKKyAgICAkZmlsZU5hbWUgPSAkX0dFVFsibmFtZSJdOworICAgICR0eXBlID0gJF9HRVRb InR5cGUiXTsKKworICAgICRfR0VUID0gYXJyYXkoKTsKKyAgICAkX0dFVFsnbmFtZSddID0gJGZp bGVOYW1lOworICAgICRfR0VUWyd0eXBlJ10gPSAkdHlwZTsKKyAgICBAaW5jbHVkZSgiLi9zZXJ2 ZS12aWRlby5waHAiKTsgCisKKz8+Cg== 141600 2012-05-12 23:04:39 -0700 2012-05-13 16:19:26 -0700 Updated patch - this time with not as many uninitialized variables. patch_2.txt text/plain 7258 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNjg2MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTEyICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIDx2aWRlbz4gd29uJ3Qg bG9hZCB3aGVuIFVSTCBlbmRzIHdpdGggLnBocAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODYzMDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUZXN0OiBodHRwL3Rlc3RzL21lZGlhL3ZpZGVvLXF1ZXJ5LXVy bC5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllcjo6TWVkaWFQbGF5ZXIpOiBJbml0aWFsaXplIG1f dHlwZUluZmVycmVkRnJvbUV4dGVuc2lvbi4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy Ojpsb2FkKTogU2V0IG1fdHlwZUluZmVycmVkRnJvbUV4dGVuc2lvbiBhcHByb3ByaWF0ZWx5Lgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXI6OmxvYWRXaXRoTmV4dE1lZGlhRW5naW5lKTog SWYgd2UgZG9uJ3QgZmluZCBhIG1lZGlhIGVuZ2luZSByZWdpc3RlcmVkCisgICAgICAgICAgICBm b3IgYSBNSU1FIHR5cGUsIGFuZCB0aGUgdHlwZSB3YXMgaW5mZXJyZWQgZnJvbSB0aGUgZXh0ZW5z aW9uLCBnaXZlIHRoZSBmaXJzdCByZWdpc3RlcmVkCisgICAgICAgICAgICBtZWRpYSBlbmdpbmUg YSBjaGFuY2UgYW53eWF5IGp1c3QgYXMgd2UgZG8gd2hlbiB0aGVyZSBpcyBubyBNSU1FIHR5cGUg YXQgYWxsLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmg6IEFkZCBt X3R5cGVJbmZlcnJlZEZyb21FeHRlbnNpb24uCisKIDIwMTItMDUtMTIgIFBoaWxpcCBSb2dlcnMg IDxwZHJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBDbGVhbnVwIGJlZm9yZSBjaGFuZ2luZyBhdHRy aWJ1dGVOYW1lIGluIFNWRyA8YW5pbWF0ZT4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAJKHJldmlzaW9uIDExNDUyMSkKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMzI1LDYgKzMyNSw3IEBAIE1lZGlhUGxheWVyOjpNZWRpYVBsYXllcihNZWRpYVBs YXllckNsaWUKICAgICAsIG1fcHJlc2VydmVzUGl0Y2godHJ1ZSkKICAgICAsIG1fcHJpdmF0ZUJy b3dzaW5nKGZhbHNlKQogICAgICwgbV9zaG91bGRQcmVwYXJlVG9SZW5kZXIoZmFsc2UpCisgICAg LCBtX3R5cGVJbmZlcnJlZEZyb21FeHRlbnNpb24oZmFsc2UpCiAjaWYgRU5BQkxFKFBMVUdJTl9Q Uk9YWV9GT1JfVklERU8pCiAgICAgLCBtX3BsYXllclByb3h5KDApCiAjZW5kaWYKQEAgLTM1MCw2 ICszNTEsNyBAQCBib29sIE1lZGlhUGxheWVyOjpsb2FkKGNvbnN0IEtVUkwmIHVybCwgCiAgICAg U3RyaW5nIHR5cGUgPSBjb250ZW50VHlwZS50eXBlKCkubG93ZXIoKTsKICAgICBTdHJpbmcgdHlw ZUNvZGVjcyA9IGNvbnRlbnRUeXBlLnBhcmFtZXRlcihjb2RlY3MoKSk7CiAgICAgU3RyaW5nIHVy bFN0cmluZyA9IHVybC5zdHJpbmcoKTsKKyAgICBtX3R5cGVJbmZlcnJlZEZyb21FeHRlbnNpb24g PSBmYWxzZTsKIAogICAgIC8vIElmIHRoZSBNSU1FIHR5cGUgaXMgbWlzc2luZyBvciBpcyBub3Qg bWVhbmluZ2Z1bCwgdHJ5IHRvIGZpZ3VyZSBpdCBvdXQgZnJvbSB0aGUgVVJMLgogICAgIGlmICh0 eXBlLmlzRW1wdHkoKSB8fCB0eXBlID09IGFwcGxpY2F0aW9uT2N0ZXRTdHJlYW0oKSB8fCB0eXBl ID09IHRleHRQbGFpbigpKSB7CkBAIC0zNjEsOCArMzYzLDEwIEBAIGJvb2wgTWVkaWFQbGF5ZXI6 OmxvYWQoY29uc3QgS1VSTCYgdXJsLCAKICAgICAgICAgICAgIGlmIChwb3MgIT0gbm90Rm91bmQp IHsKICAgICAgICAgICAgICAgICBTdHJpbmcgZXh0ZW5zaW9uID0gbGFzdFBhdGhDb21wb25lbnQu c3Vic3RyaW5nKHBvcyArIDEpOwogICAgICAgICAgICAgICAgIFN0cmluZyBtZWRpYVR5cGUgPSBN SU1FVHlwZVJlZ2lzdHJ5OjpnZXRNZWRpYU1JTUVUeXBlRm9yRXh0ZW5zaW9uKGV4dGVuc2lvbik7 Ci0gICAgICAgICAgICAgICAgaWYgKCFtZWRpYVR5cGUuaXNFbXB0eSgpKQorICAgICAgICAgICAg ICAgIGlmICghbWVkaWFUeXBlLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgICAgICAgICB0eXBl ID0gbWVkaWFUeXBlOworICAgICAgICAgICAgICAgICAgICBtX3R5cGVJbmZlcnJlZEZyb21FeHRl bnNpb24gPSB0cnVlOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAg fQogICAgIH0KQEAgLTM3NywxNCArMzgxLDE1IEBAIGJvb2wgTWVkaWFQbGF5ZXI6OmxvYWQoY29u c3QgS1VSTCYgdXJsLCAKIAogdm9pZCBNZWRpYVBsYXllcjo6bG9hZFdpdGhOZXh0TWVkaWFFbmdp bmUoTWVkaWFQbGF5ZXJGYWN0b3J5KiBjdXJyZW50KQogewotICAgIE1lZGlhUGxheWVyRmFjdG9y eSogZW5naW5lOworICAgIE1lZGlhUGxheWVyRmFjdG9yeSogZW5naW5lID0gMDsKIAotICAgIC8v IElmIG5vIE1JTUUgdHlwZSBpcyBzcGVjaWZpZWQsIGp1c3QgdXNlIHRoZSBuZXh0IGVuZ2luZS4K LSAgICBpZiAobV9jb250ZW50TUlNRVR5cGUuaXNFbXB0eSgpKQotICAgICAgICBlbmdpbmUgPSBu ZXh0TWVkaWFFbmdpbmUoY3VycmVudCk7Ci0gICAgZWxzZQorICAgIGlmICghbV9jb250ZW50TUlN RVR5cGUuaXNFbXB0eSgpKQogICAgICAgICBlbmdpbmUgPSBiZXN0TWVkaWFFbmdpbmVGb3JUeXBl QW5kQ29kZWNzKG1fY29udGVudE1JTUVUeXBlLCBtX2NvbnRlbnRUeXBlQ29kZWNzLCBtX2tleVN5 c3RlbSwgY3VycmVudCk7CiAKKyAgICAvLyBJZiBubyBNSU1FIHR5cGUgaXMgc3BlY2lmaWVkIG9y IHRoZSB0eXBlIHdhcyBpbmZlcnJlZCBmcm9tIHRoZSBmaWxlIGV4dGVuc2lvbiwganVzdCB1c2Ug dGhlIG5leHQgZW5naW5lLgorICAgIGlmICghZW5naW5lICYmIChtX2NvbnRlbnRNSU1FVHlwZS5p c0VtcHR5KCkgfHwgbV90eXBlSW5mZXJyZWRGcm9tRXh0ZW5zaW9uKSkKKyAgICAgICAgZW5naW5l ID0gbmV4dE1lZGlhRW5naW5lKGN1cnJlbnQpOworCiAgICAgLy8gRG9uJ3QgZGVsZXRlIGFuZCBy ZWNyZWF0ZSB0aGUgcGxheWVyIHVubGVzcyBpdCBjb21lcyBmcm9tIGEgZGlmZmVyZW50IGVuZ2lu ZS4KICAgICBpZiAoIWVuZ2luZSkgewogICAgICAgICBMT0coTWVkaWEsICJNZWRpYVBsYXllcjo6 bG9hZFdpdGhOZXh0TWVkaWFFbmdpbmUgLSBubyBtZWRpYSBlbmdpbmUgZm91bmQgZm9yIHR5cGUg XCIlc1wiIiwgbV9jb250ZW50TUlNRVR5cGUudXRmOCgpLmRhdGEoKSk7CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgJKHJldmlzaW9uIDEx NDUyMSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgJ KHdvcmtpbmcgY29weSkKQEAgLTM5Miw2ICszOTIsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9w cmVzZXJ2ZXNQaXRjaDsKICAgICBib29sIG1fcHJpdmF0ZUJyb3dzaW5nOwogICAgIGJvb2wgbV9z aG91bGRQcmVwYXJlVG9SZW5kZXI7CisgICAgYm9vbCBtX3R5cGVJbmZlcnJlZEZyb21FeHRlbnNp b247CiAjaWYgRU5BQkxFKFBMVUdJTl9QUk9YWV9GT1JfVklERU8pCiAgICAgV2ViTWVkaWFQbGF5 ZXJQcm94eSogbV9wbGF5ZXJQcm94eTsgICAgLy8gbm90IG93bmVkIG9yIHVzZWQsIHBhc3NlZCB0 byBtX3ByaXZhdGUKICNlbmRpZgpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTE2ODYxKQorKysgTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDUt MTIgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgPHZp ZGVvPiB3b24ndCBsb2FkIHdoZW4gVVJMIGVuZHMgd2l0aCAucGhwCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjMwOAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0cy9tZWRpYS9yZXNvdXJj ZXMvbG9hZC12aWRlby5waHA6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvbWVkaWEvdmlk ZW8tcXVlcnktdXJsLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9t ZWRpYS92aWRlby1xdWVyeS11cmwuaHRtbDogQWRkZWQuCisKIDIwMTItMDUtMTIgIFBoaWxpcCBS b2dlcnMgIDxwZHJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBDbGVhbnVwIGJlZm9yZSBjaGFuZ2lu ZyBhdHRyaWJ1dGVOYW1lIGluIFNWRyA8YW5pbWF0ZT4KSW5kZXg6IExheW91dFRlc3RzL2h0dHAv dGVzdHMvbWVkaWEvdmlkZW8tcXVlcnktdXJsLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3ZpZGVvLXF1ZXJ5LXVybC1leHBlY3RlZC50eHQJ KHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3ZpZGVvLXF1ZXJ5 LXVybC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNSBAQAorIAorVGVzdHMg dGhhdCBXZWJLaXQgaXMgYWJsZSB0byBvcGVuIGEgbWVkaWEgZmlsZSBzcGVjaWZpZWQgd2l0aCBh IHF1ZXJ5IHVybC4gIAorRVZFTlQoY2FucGxheSkKK0VORCBPRiBURVNUCisKSW5kZXg6IExheW91 dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvdmlkZW8tcXVlcnktdXJsLmh0bWwKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS92aWRlby1xdWVyeS11cmwuaHRtbAkocmV2 aXNpb24gMCkKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvdmlkZW8tcXVlcnktdXJs Lmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMzQgQEAKKzxodG1sPgorICAgIDxoZWFkPgor ICAgICAgICA8c2NyaXB0IHNyYz0uLi8uLi9tZWRpYS1yZXNvdXJjZXMvdmlkZW8tdGVzdC5qcz48 L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Li4vLi4vbWVkaWEtcmVzb3VyY2VzL21lZGlh LWZpbGUuanM+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQ+CisgICAgICAgICAgICBmdW5jdGlv biBsb2FkTWVkaWFGcmFtZSgpIAorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGZpbmRN ZWRpYUVsZW1lbnQoKTsKKworICAgICAgICAgICAgICAgIHZhciBtb3ZpZSA9IGZpbmRNZWRpYUZp bGUoJ3ZpZGVvJywgJ3Rlc3QnKTsKKyAgICAgICAgICAgICAgICB2YXIgdHlwZSA9IG1pbWVUeXBl Rm9yRXh0ZW5zaW9uKG1vdmllLnNwbGl0KCcuJykucG9wKCkpOworICAgICAgICAgICAgICAgIHZh ciBmcmFtZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2lmcmFtZScpOworCisgICAgICAgICAg ICAgICAgZnJhbWUud2lkdGggPSAwOworICAgICAgICAgICAgICAgIGZyYW1lLmhlaWdodCA9IDA7 CisgICAgICAgICAgICAgICAgZnJhbWUuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIGZ1bmN0aW9u ICgpIHsKKyAgICAgICAgICAgICAgICAgICAgdmlkZW8uc3JjID0gJ2h0dHA6Ly8xMjcuMC4wLjE6 ODAwMC9tZWRpYS9yZXNvdXJjZXMvbG9hZC12aWRlby5waHA/bmFtZT0nICsgbW92aWUgKyAnJnR5 cGU9JyArIHR5cGU7CisgICAgCisgICAgICAgICAgICAgICAgICAgIHdhaXRGb3JFdmVudEFuZEZh aWwoJ2Vycm9yJyk7CisgICAgICAgICAgICAgICAgICAgIHdhaXRGb3JFdmVudEFuZEVuZCgnY2Fu cGxheScpOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICAKKyAgICAgICAgICAgICAgICBm cmFtZS5zcmMgPSAiZGF0YTp0ZXh0L2h0bWwsPGI+dGVzdDwvYj4iOworICAgICAgICAgICAgICAg IGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoZnJhbWUpOworICAgICAgICAgICAgfQorICAgICAg ICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisKKyAgICA8Ym9keSBvbmxvYWQ9ImxvYWRNZWRpYUZy YW1lKCkiPgorICAgICAgICA8dmlkZW8gY29udHJvbHM+PC92aWRlbz4KKyAgICAgICAgPGJyPgor ICAgICAgICBUZXN0cyB0aGF0IFdlYktpdCBpcyBhYmxlIHRvIG9wZW4gYSBtZWRpYSBmaWxlIHNw ZWNpZmllZCB3aXRoIGEgcXVlcnkgdXJsLgorICAgIDwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IExh eW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvcmVzb3VyY2VzL2xvYWQtdmlkZW8ucGhwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvcmVzb3VyY2VzL2xvYWQtdmlk ZW8ucGhwCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9yZXNv dXJjZXMvbG9hZC12aWRlby5waHAJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTEgQEAKKzw/cGhw CisKKyAgICAkZmlsZU5hbWUgPSAkX0dFVFsibmFtZSJdOworICAgICR0eXBlID0gJF9HRVRbInR5 cGUiXTsKKworICAgICRfR0VUID0gYXJyYXkoKTsKKyAgICAkX0dFVFsnbmFtZSddID0gJGZpbGVO YW1lOworICAgICRfR0VUWyd0eXBlJ10gPSAkdHlwZTsKKyAgICBAaW5jbHVkZSgiLi9zZXJ2ZS12 aWRlby5waHAiKTsgCisKKz8+Cg==