Merge pull request #511 from s3fs-fuse/issue#435

Fixed a bug about uploading NULL to some part of the file contents

.travis.yml

@@ -5,6 +5,7 @@ cache: apt
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq cppcheck libfuse-dev openjdk-7-jdk
+ - sudo update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
 script:
  - ./autogen.sh
  - ./configure

src/fdcache.cpp

@@ -664,7 +664,7 @@ void FdEntity::Clear(void)
 {
   AutoLock auto_lock(&fdent_lock);
 
-  if(pfile){
+  if(-1 != fd){
     if(0 != cachepath.size()){
       CacheFileStat cfstat(path.c_str());
       if(!pagelist.Serialize(cfstat, true)){
@@ -1963,8 +1963,23 @@ FdEntity* FdManager::Open(const char* path, headers_t* pmeta, ssize_t size, time
   }
   AutoLock auto_lock(&FdManager::fd_manager_lock);
 
+  // search in mapping by key(path)
   fdent_map_t::iterator iter = fent.find(string(path));
-  FdEntity*             ent;
+
+  if(fent.end() == iter && !force_tmpfile && !FdManager::IsCacheDir()){
+    // If the cache directory is not specified, s3fs opens a temporary file
+    // when the file is opened.
+    // Then if it could not find a entity in map for the file, s3fs should
+    // search a entity in all which opened the temporary file.
+    //
+    for(iter = fent.begin(); iter != fent.end(); ++iter){
+      if((*iter).second && (*iter).second->IsOpen() && 0 == strcmp((*iter).second->GetPath(), path)){
+        break;      // found opened fd in mapping
+      }
+    }
+  }
+
+  FdEntity* ent;
   if(fent.end() != iter){
     // found
     ent = (*iter).second;
@@ -2050,16 +2065,30 @@ bool FdManager::Close(FdEntity* ent)
 {
   S3FS_PRN_DBG("[ent->file=%s][ent->fd=%d]", ent ? ent->GetPath() : "", ent ? ent->GetFd() : -1);
 
+  if(!ent){
+    return true;  // returns success
+  }
+
   AutoLock auto_lock(&FdManager::fd_manager_lock);
 
   for(fdent_map_t::iterator iter = fent.begin(); iter != fent.end(); ++iter){
     if((*iter).second == ent){
       ent->Close();
       if(!ent->IsOpen()){
-        delete (*iter).second;
-        fent.erase(iter);
-        return true;
+        // remove found entity from map.
+        fent.erase(iter++);
+
+        // check another key name for entity value to be on the safe side
+        for(; iter != fent.end(); ){
+          if((*iter).second == ent){
+            fent.erase(iter++);
+          }else{
+            ++iter;
+          }
+        }
+        delete ent;
       }
+      return true;
     }
   }
   return false;