From 4687a1c9ffe0d1d3f6ea01f360faa542a5b6491c Mon Sep 17 00:00:00 2001
From: Kees Cook <kees@outflux.net>
Date: Tue, 20 Mar 2007 17:16:36 +0000
Subject: format string protection/clean up (CVE-2007-1463, CVE-2007-1464)

(bzr r2720)
---
 src/util/format.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/util')

diff --git a/src/util/format.h b/src/util/format.h
index 3066173e1..80d79c28a 100644
--- a/src/util/format.h
+++ b/src/util/format.h
@@ -13,7 +13,7 @@
 #define SEEN_INKSCAPE_UTIL_FORMAT_H
 
 #include <stdarg.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include "util/share.h"
 
 namespace Inkscape {
@@ -27,6 +27,8 @@ inline ptr_shared<char> vformat(char const *format, va_list args) {
     return result;
 }
 
+       // needed since G_GNUC_PRINTF can only be used on a declaration
+       ptr_shared<char> format(char const *format, ...) G_GNUC_PRINTF(1,2);
 inline ptr_shared<char> format(char const *format, ...) {
     va_list args;
 
-- 
cgit v1.2.3