Merge pull request #15 from apinf/hardening/warnings_as_errors_in_ubu…

…ntu_1704 Hardening/warnings as errors in ubuntu 1704
telefonicaid · Jan 10, 2018 · 1f09699 · 1f09699
2 parents 6939479 + b9173da
commit 1f09699
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,8 +74,12 @@ add_definitions(-fPIC)
 #
 # A grep of 'std::auto_ptr<' in the header files show 7 hits, and 13 hits in cpp files
 #
+# In PR https://github.com/apinf/fiware-orion/pull/15, a workaround for Ubuntu is implemented.
+# This workaround consists of putting back the -Werror flag and instead solving the problem by
+# adding another flag: -Wno-deprecated-declarations
+#
 IF (${DISTRO} STREQUAL "Ubuntu_17.04")
-  set (CMAKE_CXX_FLAGS "-Wall -Wno-unknown-pragmas -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -fno-var-tracking-assignments")
+ set (CMAKE_CXX_FLAGS "-Wall -Wno-unknown-pragmas -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -Werror -Wno-deprecated-declarations -fno-var-tracking-assignments")
 ELSE()
   set (CMAKE_CXX_FLAGS "-Wall -Wno-unknown-pragmas -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -Werror -fno-var-tracking-assignments")
 ENDIF ()

diff --git a/src/lib/logMsg/logMsg.cpp b/src/lib/logMsg/logMsg.cpp
@@ -2905,10 +2905,16 @@ int64_t lmLogLineGet
     }
 
     // Set file pointer to the beginning of the fifth line
-    fgets(line, 1024, fP);
-    fgets(line, 1024, fP);
-    fgets(line, 1024, fP);
-    fgets(line, 1024, fP);
+    char* fgP;
+
+    fgP = fgets(line, 1024, fP);
+    if (fgP != NULL) fgP = fgets(line, 1024, fP);
+    if (fgP != NULL) fgP = fgets(line, 1024, fP);
+    if (fgP != NULL) fgP = fgets(line, 1024, fP);
+    if (fgP == NULL)
+    {
+      goto lmerror;
+    }
   }
   else
   {

diff --git a/src/lib/rest/HttpHeaders.h b/src/lib/rest/HttpHeaders.h
@@ -58,15 +58,15 @@
 *
 * CORS Allowed Headers -
 */
-#define CORS_ALLOWED_HEADERS CONTENT_TYPE", "FIWARE_SERVICE", "FIWARE_SERVICEPATH", "NGSIV2_ATTRSFORMAT", "FIWARE_CORRELATOR", "X_FORWARDED_FOR", "X_REAL_IP", "X_AUTH_TOKEN
+#define CORS_ALLOWED_HEADERS CONTENT_TYPE ", " FIWARE_SERVICE ", " FIWARE_SERVICEPATH ", " NGSIV2_ATTRSFORMAT ", " FIWARE_CORRELATOR ", " X_FORWARDED_FOR ", " X_REAL_IP ", " X_AUTH_TOKEN
 
 
 
 /* ****************************************************************************
 *
 * CORS Exposed Headers -
 */
-#define CORS_EXPOSED_HEADERS FIWARE_CORRELATOR", "FIWARE_TOTAL_COUNT", "RESOURCE_LOCATION
+#define CORS_EXPOSED_HEADERS FIWARE_CORRELATOR ", " FIWARE_TOTAL_COUNT ", " RESOURCE_LOCATION