emess(): avoid potential unsafe uses

rouault · Jan 10, 2024 · 00b96ad · 00b96ad
1 parent 33aa704
commit 00b96ad
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/apps/cs2cs.cpp b/src/apps/cs2cs.cpp
@@ -899,7 +899,7 @@ int main(int argc, char **argv) {
             sourceEpochDbl = c_locale_stod(sourceEpoch);
         } catch (const std::exception &e) {
             sourceEpochDbl = 0;
-            emess(3, e.what());
+            emess(3, "%s", e.what());
         }
         srcMetadata =
             proj_coordinate_metadata_create(nullptr, src, sourceEpochDbl);
@@ -917,7 +917,7 @@ int main(int argc, char **argv) {
             targetEpochDbl = c_locale_stod(targetEpoch);
         } catch (const std::exception &e) {
             targetEpochDbl = 0;
-            emess(3, e.what());
+            emess(3, "%s", e.what());
         }
         dstMetadata =
             proj_coordinate_metadata_create(nullptr, dst, targetEpochDbl);

diff --git a/src/apps/emess.h b/src/apps/emess.h
@@ -19,6 +19,13 @@ extern struct EMESS emess_dat;
 
 #endif /* use type */
 
-void emess(int, const char *, ...);
+#if defined(__GNUC__)
+#define EMESS_PRINT_FUNC_FORMAT(format_idx, arg_idx)                           \
+    __attribute__((__format__(__printf__, format_idx, arg_idx)))
+#else
+#define EMESS_PRINT_FUNC_FORMAT(format_idx, arg_idx)
+#endif
+
+void emess(int, const char *, ...) EMESS_PRINT_FUNC_FORMAT(2, 3);
 
 #endif /* end EMESS_H */
diff --git a/src/apps/proj.cpp b/src/apps/proj.cpp
@@ -279,7 +279,7 @@ static void vprocess(FILE *fid) {
         }
 
         if (proj_context_errno(nullptr)) {
-            emess(-1, proj_errno_string(proj_context_errno(nullptr)));
+            emess(-1, "%s", proj_errno_string(proj_context_errno(nullptr)));
             continue;
         }