Fixed load_file method (considers EOF)

Author: etr

configure.ac

@@ -308,7 +308,7 @@ AC_SUBST(LDFLAGS)
 AC_SUBST(EXT_LIB_PATH)
 AC_SUBST(EXT_LIBS)
 
-AC_CONFIG_LINKS([test/run_tests:test/run_tests])
+AC_CONFIG_LINKS([test/test_content:test/test_content])
 
 AC_OUTPUT(
       libhttpserver.pc

src/http_utils.cpp

@@ -524,21 +524,24 @@ bool ip_representation::operator <(const ip_representation& b) const
 
 char* load_file (const char *filename)
 {
-    char* content = NULL;
-
     ifstream fp(filename, ios::in | ios::binary | ios::ate);
     if(fp.is_open())
     {
+        fp.seekg(0, fp.end);
         int size = fp.tellg();
-        content = (char*) malloc(size * sizeof(char));
-        fp.seekg(0, ios::beg);
+        fp.seekg(0, fp.beg);
+
+        char* content = new char[size];
         fp.read(content, size);
         fp.close();
+
+        content[size - 1] = 0;
         return content;
     }
     else
+    {
         throw std::invalid_argument("Unable to open file");
-    return content;
+    }
 }
 
 void dump_header_map(std::ostream &os, const std::string &prefix,

src/httpserver/create_webserver.hpp

@@ -201,21 +201,21 @@ class create_webserver
         {
             char* _https_mem_key_pt = http::load_file(https_mem_key.c_str());
             _https_mem_key = _https_mem_key_pt;
-            free(_https_mem_key_pt);
+            delete _https_mem_key_pt;
             return *this;
         }
         create_webserver& https_mem_cert(const std::string& https_mem_cert)
         {
             char* _https_mem_cert_pt = http::load_file(https_mem_cert.c_str());
             _https_mem_cert = _https_mem_cert_pt;
-            free(_https_mem_cert_pt);
+            delete _https_mem_cert_pt;
             return *this;
         }
         create_webserver& https_mem_trust(const std::string& https_mem_trust)
         {
             char* _https_mem_trust_pt = http::load_file(https_mem_trust.c_str());
             _https_mem_trust = _https_mem_trust_pt;
-            free(_https_mem_trust_pt);
+            delete _https_mem_trust_pt;
             return *this;
         }
         create_webserver& raw_https_mem_key(const std::string& https_mem_key)

test/run_tests

@@ -0,0 +1 @@
+test content of file

test/test_content

@@ -468,6 +468,14 @@ LT_BEGIN_AUTO_TEST(http_utils_suite, ip_representation6_sockaddr)
     LT_CHECK_EQ(test_ip.mask, 0xFFFF);
 LT_END_AUTO_TEST(ip_representation6_sockaddr)
 
+LT_BEGIN_AUTO_TEST(http_utils_suite, load_file)
+    LT_CHECK_EQ(std::string(http::load_file("test_content")), "test content of file");
+LT_END_AUTO_TEST(load_file)
+
+LT_BEGIN_AUTO_TEST(http_utils_suite, load_file_invalid)
+    LT_CHECK_THROW(http::load_file("test_content_invalid"));
+LT_END_AUTO_TEST(load_file_invalid)
+
 LT_BEGIN_AUTO_TEST_ENV()
     AUTORUN_TESTS()
 LT_END_AUTO_TEST_ENV()