Prefer 'filename' parameters if both 'name' and 'filename' parameters are specified in a Content-Di…

net/http/http_content_disposition.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_content_disposition.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "net/base/net_util.h"
 #include "net/http/http_util.h"
@@ skipping 51 matching lines @@
 //
 void HttpContentDisposition::Parse(const std::string& header,
                                    const std::string& referrer_charset) {
   DCHECK(type_ == INLINE);
   DCHECK(filename_.empty());
 
   std::string::const_iterator pos = header.begin();
   std::string::const_iterator end = header.end();
   pos = ConsumeDispositionType(pos, end);
 
+  std::string name;
   std::string filename;
   std::string ext_filename;
 
   HttpUtil::NameValuePairsIterator iter(pos, end, ';');
   while (iter.GetNext()) {
     if (filename.empty() && LowerCaseEqualsASCII(iter.name_begin(),
                                                  iter.name_end(),
                                                  "filename")) {
       DecodeFilenameValue(iter.value(), referrer_charset, &filename);
-    } else if (filename.empty() && LowerCaseEqualsASCII(iter.name_begin(),
-                                                        iter.name_end(),
-                                                        "name")) {
-      DecodeFilenameValue(iter.value(), referrer_charset, &filename);
+    } else if (name.empty() && LowerCaseEqualsASCII(iter.name_begin(),
+                                                    iter.name_end(),
+                                                    "name")) {
+      DecodeFilenameValue(iter.value(), referrer_charset, &name);
     } else if (ext_filename.empty() && LowerCaseEqualsASCII(iter.name_begin(),
                                                             iter.name_end(),
                                                             "filename*")) {
       DecodeExtValue(iter.raw_value(), &ext_filename);
     }
   }
 
-  filename_ = ext_filename.empty() ? filename : ext_filename;
+  if (!ext_filename.empty())
+    filename_ = ext_filename;
+  else if (!filename.empty())
+    filename_ = filename;
+  else
+    filename_ = name;
 }
 
 }  // namespace net