a8f26cf252
Security: http://trolltech.com/company/newsroom/announcements/press.2007-07-27.750375 Security: CVE-2007-3388
42 lines
No EOL
1.7 KiB
Diff
42 lines
No EOL
1.7 KiB
Diff
--- src/corelib/global/qglobal.h
|
|
+++ src/corelib/global/qglobal.h
|
|
@@ -1266,8 +1266,16 @@ Q_CORE_EXPORT void qFatal(const char *,
|
|
#ifdef QT3_SUPPORT
|
|
Q_CORE_EXPORT QT3_SUPPORT void qSystemWarning(const char *msg, int code = -1);
|
|
#endif /* QT3_SUPPORT */
|
|
-Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...);
|
|
-Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...);
|
|
+Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...)
|
|
+#if defined(Q_CC_GNU) && !defined(__INSURE__)
|
|
+ __attribute__ ((format (printf, 2, 3)))
|
|
+#endif
|
|
+ ;
|
|
+Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...)
|
|
+#if defined(Q_CC_GNU) && !defined(__INSURE__)
|
|
+ __attribute__ ((format (printf, 1, 2)))
|
|
+#endif
|
|
+ ;
|
|
|
|
#if (defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_TEXTSTREAM)) && !defined(QT_NO_DEBUG_STREAM)
|
|
#define QT_NO_DEBUG_STREAM
|
|
--- src/corelib/tools/qbytearray.h
|
|
+++ src/corelib/tools/qbytearray.h
|
|
@@ -71,8 +71,16 @@ Q_CORE_EXPORT int qstricmp(const char *,
|
|
Q_CORE_EXPORT int qstrnicmp(const char *, const char *, uint len);
|
|
|
|
// implemented in qvsnprintf.cpp
|
|
-Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap);
|
|
-Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...);
|
|
+Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap)
|
|
+#if defined(Q_CC_GNU) && !defined(__INSURE__)
|
|
+ __attribute__ ((format (printf, 3, 0)))
|
|
+#endif
|
|
+ ;
|
|
+Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...)
|
|
+#if defined(Q_CC_GNU) && !defined(__INSURE__)
|
|
+ __attribute__ ((format (printf, 3, 4)))
|
|
+#endif
|
|
+ ;
|
|
|
|
#ifdef QT3_SUPPORT
|
|
inline QT3_SUPPORT void *qmemmove(void *dst, const void *src, uint len)
|