format string protection/clean up (CVE-2007-1463, CVE-2007-1464)

[inkscape.git] / src / pedro / pedroxmpp.h

diff --git a/src/pedro/pedroxmpp.h b/src/pedro/pedroxmpp.h
index 1ad849b9903e517dccd03718ce7a8207b848a0b2..554cb76c666ae16a2b23a3b6e4bfe7997233f7f6 100644 (file)
--- a/src/pedro/pedroxmpp.h
+++ b/src/pedro/pedroxmpp.h
@@ -24,6 +24,7 @@
  */
 
 #include <stdio.h>
+#include <glib.h>
 #include <vector>
 #include <map>
 
@@ -566,13 +567,13 @@ public:
     /**
      * Send an error message to all subscribers
      */
-    void error(char *fmt, ...);
+    void error(char *fmt, ...) G_GNUC_PRINTF(2,3);
 
 
     /**
      * Send a status message to all subscribers
      */
-    void status(char *fmt, ...);
+    void status(char *fmt, ...) G_GNUC_PRINTF(2,3);
 
     //###########################
     //# LISTENERS
@@ -629,10 +630,6 @@ private:
 
     std::vector<XmppEvent> eventQueue;
     bool eventQueueEnabled;
-
-    static const int targetWriteBufLen = 2048;
-
-    char targetWriteBuf[targetWriteBufLen];
 };
 
 
@@ -725,7 +722,7 @@ public:
     /**
      *
      */
-    virtual bool write(char *fmt, ...);
+    virtual bool write(char *fmt, ...) G_GNUC_PRINTF(2,3);
 
     //#######################
     //# V A R I A B L E S
@@ -1146,10 +1143,6 @@ private:
 
     bool doRegister;
 
-    static const int writeBufLen = 2048;
-
-    unsigned char writeBuf[writeBufLen];
-
     std::vector<XmppGroupChat *>groupChats;
 
     //#### Roster