2007-07-18 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Fixed the bug that prevents filename in content-disposition from
	being retrieved when filename is not quoted.
	* src/Util.cc (getContentDispositionFilename)

	Fixed the bug that causes infinate loop and memory leak when 
file open
	operation failed.
	* src/HttpResponseCommand.cc (handleDefaultEncoding)

1 files changed, 11 insertions, 6 deletions

diff --git a/src/HttpResponseCommand.cc b/src/HttpResponseCommand.cc
index 5bdf4349..821406f6 100644
--- a/src/HttpResponseCommand.cc
+++ b/src/HttpResponseCommand.cc
@@ -142,13 +142,18 @@ bool HttpResponseCommand::handleDefaultEncoding(const HttpResponseHandle& httpRe
   }
 
   DownloadCommand* command = 0;
-  File file(_requestGroup->getFilePath());
-  if(_requestGroup->getRemainingUris().empty() && !file.exists()) {
-    command = createHttpDownloadCommand(httpResponse);
+  try {
+    File file(_requestGroup->getFilePath());
+    if(_requestGroup->getRemainingUris().empty() && !file.exists()) {
+      command = createHttpDownloadCommand(httpResponse);
+    }
+    _requestGroup->loadAndOpenFile();
+    _requestGroup->prepareForNextAction(cuid, req, e, command);
+    e->noWait = true;
+  } catch(Exception* e) {
+    delete command;
+    throw;
   }
-  _requestGroup->loadAndOpenFile();
-  _requestGroup->prepareForNextAction(cuid, req, e, command);
-  e->noWait = true;
   return true;
 }