Fix for https://issues.infn.it/jira/browse/STOR-331 using strtoull.

italiangrid · Aug 26, 2013 · f1fae1f · f1fae1f
1 parent 4029e36
commit f1fae1f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/configure.ac b/configure.ac
@@ -13,9 +13,8 @@
 # limitations under the License.
 
 AC_PREREQ([2.59])
-AC_INIT([storm frontend server], [1.8.2])
+AC_INIT([storm frontend server], [1.8.3])
 AC_CONFIG_AUX_DIR([./project])
-#AM_INIT_AUTOMAKE([1.6.3 subdir-objects])
 AC_CONFIG_SRCDIR([src/frontend/storm-frontend.cpp])
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/src/frontend/BolStatusRequest.cpp b/src/frontend/BolStatusRequest.cpp
@@ -97,7 +97,7 @@ void storm::BolStatusRequest::loadFromDB(struct srm_dbfd* db) throw (storm::Toke
 		}
 		else
 		{
-			turl = new BolTurl(surl, atoi(currentResutl["fileSize"].c_str()));
+			turl = new BolTurl(surl, strtoull(currentResutl["fileSize"].c_str(),(char**)NULL,10));
 		}
 		if(currentResutl["statusCode"].empty())
 		{

diff --git a/src/frontend/CopyStatusRequest.cpp b/src/frontend/CopyStatusRequest.cpp
@@ -134,7 +134,7 @@ void storm::CopyStatusRequest::loadFromDB(struct srm_dbfd* db) throw (storm::Tok
 		}
 		else
 		{
-			turl = new CopyTurl(surl, destinationSURL, atoi(currentResutl["fileSize"].c_str()));
+			turl = new CopyTurl(surl, destinationSURL, strtoull(currentResutl["fileSize"].c_str(),(char**)NULL,10));
 		}
 		if(currentResutl["statusCode"].empty())
 		{

diff --git a/src/frontend/GetStatusRequest.cpp b/src/frontend/GetStatusRequest.cpp
@@ -100,7 +100,7 @@ void storm::GetStatusRequest::loadFromDB(struct srm_dbfd* db) throw (storm::Toke
 			}
 			else
 			{
-				turl = new PtgTurl(turlString,surl, atoi(currentResutl["fileSize"].c_str()), -1);
+				turl = new PtgTurl(turlString,surl, strtoull(currentResutl["fileSize"].c_str(),(char**)NULL,10), -1);
 			}
 		}
 		else
@@ -111,7 +111,7 @@ void storm::GetStatusRequest::loadFromDB(struct srm_dbfd* db) throw (storm::Toke
 			}
 			else
 			{
-				turl = new PtgTurl(surl, atoi(currentResutl["fileSize"].c_str()), -1);
+				turl = new PtgTurl(surl, strtoull(currentResutl["fileSize"].c_str(),(char**)NULL,10), -1);
 			}
 		}
 

diff --git a/src/frontend/PutStatusRequest.cpp b/src/frontend/PutStatusRequest.cpp
@@ -105,16 +105,18 @@ void storm::PutStatusRequest::loadFromDB(struct srm_dbfd* db) throw (storm::Toke
 				turl = new storm::PtpTurl(turlString, surl);
 			  }
 			  else {
-			    turl = new storm::PtpTurl(turlString, surl, -1, atoi(currentResutl["expectedFileSize"].c_str()));
+			    turl = new storm::PtpTurl(turlString, surl, -1,
+                strtoull(currentResutl["expectedFileSize"].c_str(),(char**)NULL,10));
 			  }
 			}
 			else
 			{
 			  if(currentResutl["expectedFileSize"].empty()) {
-			    turl = new storm::PtpTurl(turlString,surl, atoi(currentResutl["fileSize"].c_str()), -1);
+			    turl = new storm::PtpTurl(turlString,surl, strtoull(currentResutl["fileSize"].c_str(),(char**)NULL,10), -1);
 			  } 
 			  else {
-			    turl = new storm::PtpTurl(turlString,surl, atoi(currentResutl["fileSize"].c_str()), atoi(currentResutl["expectedFileSize"].c_str()));
+			    turl = new storm::PtpTurl(turlString,surl, strtoull(currentResutl["fileSize"].c_str(),(char**)NULL,10), 
+                    strtoull(currentResutl["expectedFileSize"].c_str(),(char**)NULL,10));
 			  }
 			}
 		}
@@ -127,16 +129,17 @@ void storm::PutStatusRequest::loadFromDB(struct srm_dbfd* db) throw (storm::Toke
 				turl = new storm::PtpTurl(surl);
 			  }
 			  else {
-			    turl = new storm::PtpTurl(surl, -1, atoi(currentResutl["expectedFileSize"].c_str()));
+			    turl = new storm::PtpTurl(surl, -1, strtoull(currentResutl["expectedFileSize"].c_str(),(char**)NULL,10));
 			  }
 			}
 			else
 			{
 			  if(currentResutl["expectedFileSize"].empty()) {
-			    turl = new storm::PtpTurl(surl, atoi(currentResutl["fileSize"].c_str()), -1);			  
+			    turl = new storm::PtpTurl(surl, strtoull(currentResutl["fileSize"].c_str(),(char**)NULL,10), -1);			  
 			  }
 			  else {
-			    turl = new storm::PtpTurl(surl, atoi(currentResutl["fileSize"].c_str()), atoi(currentResutl["expectedFileSize"].c_str()));
+			    turl = new storm::PtpTurl(surl, strtoull(currentResutl["fileSize"].c_str(),(char**)NULL,10),
+                strtoull(currentResutl["expectedFileSize"].c_str(),(char**)NULL,10));
 			  }
 			}
 		}

diff --git a/src/frontend/xmlrpc_decode.c b/src/frontend/xmlrpc_decode.c
@@ -1028,7 +1028,7 @@ int decode_ULONG64(const char *callerName,
     *outputULONG64 = soap_malloc(soap, sizeof(ULONG64));
     if (NULL == *(outputULONG64)) return(DECODE_ERR_SOAP_MEMORY_ERROR);
 
-    **outputULONG64 = atoll((char*) strULONG64);
+    **outputULONG64 = strtoull((char*) strULONG64, (char**)NULL,10);
 
     // strULONG64 is allocated with soap_strdup(), therefore it must not be freed
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     		else
     		{
-    			turl = new BolTurl(surl, atoi(currentResutl["fileSize"].c_str()));
+    			turl = new BolTurl(surl, strtoull(currentResutl["fileSize"].c_str(),(char**)NULL,10));
     		}
     		if(currentResutl["statusCode"].empty())
     		{
@@ Expand Down @@