[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    QUANTA_3_1_BRANCH: quanta
From:       Dirk Mueller <mueller () kde ! org>
Date:       2003-07-03 19:03:56
[Download RAW message or body]

CVS commit by mueller: 

fix format string vulnerabilities (backport)


  M +2 -2      .cvsignore   1.9.2.1
  M +3 -3      kommander/editor/assistproc.cpp   1.2.2.1
  M +1 -1      kommander/widgets/assoctextwidget.cpp   1.1.2.2
  M +5 -1      quanta/plugins/php4dbg/listener.h   1.2.4.1


--- quanta/.cvsignore  #1.9:1.9.2.1
@@ -7,8 +7,9 @@
 config.cache
 config.status
+configure.files
 acinclude.m4
 aclocal.m4
 libtool
-stamp-h
+stamp-h*
 ltc*
 *.kdevprj
@@ -17,5 +18,4 @@
 configure.in
 autom4te.cache
-stamp-h1
 build-stamp
 configure-stamp

--- quanta/kommander/editor/assistproc.cpp  #1.2:1.2.2.1
@@ -44,5 +44,5 @@ bool AssistProc::run( const QString &pat
 
     if ( !start() ) {
-        qWarning( QString("Assistant [exe]: Couldn't start \'%1\', please check \
path.").arg(assistantPath) ); +        qWarning( "Assistant [exe]: Couldn't start \
\'%s\', please check path.", assistantPath.latin1() );  return FALSE;
     }
@@ -65,10 +65,10 @@ bool AssistProc::sendRequest( const QStr
 void AssistProc::processOutput()
 {
-    qWarning( QString("Assistant [out]: %1").arg(QString(readStdout())) );
+    qWarning( "Assistant [out]: %s", readStdout().data() );
 }
 
 void AssistProc::processErrOutput()
 {
-    qWarning( QString("Assistant [err]: %1").arg(QString(readStderr())) );
+    qWarning( "Assistant [err]: %s", readStderr().data() );
 }
 #include "assistproc.moc"

--- quanta/kommander/widgets/assoctextwidget.cpp  #1.1.2.1:1.1.2.2
@@ -287,4 +287,4 @@ QString AssocTextWidget::execCommand(QSt
 void AssocTextWidget::printError(QString a_className, QString a_error) const
 {
-        qWarning(QString("In widget %1:\n\t").arg(a_className) + a_error);
+        qWarning("In widget %s:\n\t%s", a_className.latin1(), a_error.latin1());
 }

--- quanta/quanta/plugins/php4dbg/listener.h  #1.2:1.2.4.1
@@ -17,5 +17,9 @@ public:
   int socket() { return listensock; }
   TH_LIST* getthlist() { return &th_list; }
-  void log(ListenerLogKind kind, char *message,...);
+  void log(ListenerLogKind kind, char *message,...)
+#ifdef __GNUC__
+  __attribute__ (( format ( printf, 3,4 ) ))
+#endif
+      ;
   void destroy_client_p(ThreadBase *client) { client->destroy(); }
   


[prev in list] [next in list] [prev in thread] [next in thread]