llvm-toolchain/debian/patches/23-strlcpy_strlcat_warning_removed.diff
2013-06-06 16:41:26 +00:00

81 lines
4.0 KiB
Diff

Index: llvm-toolchain-snapshot_3.4~svn183420/clang/include/clang/Basic/Builtins.def
===================================================================
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/include/clang/Basic/Builtins.def 2013-05-31 18:29:28.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/include/clang/Basic/Builtins.def 2013-06-06 18:36:59.000000000 +0200
@@ -464,8 +464,8 @@
BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF")
BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF")
BUILTIN(__builtin___strcpy_chk, "c*c*cC*z", "nF")
-BUILTIN(__builtin___strlcat_chk, "zc*cC*zz", "nF")
-BUILTIN(__builtin___strlcpy_chk, "zc*cC*zz", "nF")
+//BUILTIN(__builtin___strlcat_chk, "zc*cC*zz", "nF")
+//BUILTIN(__builtin___strlcpy_chk, "zc*cC*zz", "nF")
BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF")
BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF")
BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF")
@@ -757,8 +757,8 @@
LIBBUILTIN(_longjmp, "vJi", "fr", "setjmp.h", ALL_GNU_LANGUAGES)
LIBBUILTIN(siglongjmp, "vSJi", "fr", "setjmp.h", ALL_GNU_LANGUAGES)
// non-standard but very common
-LIBBUILTIN(strlcpy, "zc*cC*z", "f", "string.h", ALL_GNU_LANGUAGES)
-LIBBUILTIN(strlcat, "zc*cC*z", "f", "string.h", ALL_GNU_LANGUAGES)
+//LIBBUILTIN(strlcpy, "zc*cC*z", "f", "string.h", ALL_GNU_LANGUAGES)
+//LIBBUILTIN(strlcat, "zc*cC*z", "f", "string.h", ALL_GNU_LANGUAGES)
// id objc_msgSend(id, SEL, ...)
LIBBUILTIN(objc_msgSend, "GGH.", "f", "objc/message.h", OBJC_LANG)
// long double objc_msgSend_fpret(id self, SEL op, ...)
Index: llvm-toolchain-snapshot_3.4~svn183420/clang/lib/Sema/SemaChecking.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/lib/Sema/SemaChecking.cpp 2013-06-02 10:11:22.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/lib/Sema/SemaChecking.cpp 2013-06-06 18:36:59.000000000 +0200
@@ -575,9 +575,10 @@
return false;
// Handle memory setting and copying functions.
- if (CMId == Builtin::BIstrlcpy || CMId == Builtin::BIstrlcat)
- CheckStrlcpycatArguments(TheCall, FnInfo);
- else if (CMId == Builtin::BIstrncat)
+// if (CMId == Builtin::BIstrlcpy || CMId == Builtin::BIstrlcat)
+// CheckStrlcpycatArguments(TheCall, FnInfo);
+// else
+ if (CMId == Builtin::BIstrncat)
CheckStrncatArguments(TheCall, FnInfo);
else
CheckMemaccessArguments(TheCall, CMId, FnInfo);
Index: llvm-toolchain-snapshot_3.4~svn183420/clang/lib/AST/Decl.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/lib/AST/Decl.cpp 2013-06-04 15:43:35.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/lib/AST/Decl.cpp 2013-06-06 18:36:59.000000000 +0200
@@ -2802,10 +2802,10 @@
case Builtin::BImemmove:
return Builtin::BImemmove;
- case Builtin::BIstrlcpy:
- return Builtin::BIstrlcpy;
- case Builtin::BIstrlcat:
- return Builtin::BIstrlcat;
+// case Builtin::BIstrlcpy:
+// return Builtin::BIstrlcpy;
+// case Builtin::BIstrlcat:
+// return Builtin::BIstrlcat;
case Builtin::BI__builtin_memcmp:
case Builtin::BImemcmp:
Index: llvm-toolchain-snapshot_3.4~svn183420/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-02-20 23:23:23.000000000 +0100
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-06-06 18:36:59.000000000 +0200
@@ -238,9 +238,9 @@
case Builtin::BIstrncpy:
case Builtin::BIstrncat:
return TaintPropagationRule(1, 2, 0, true);
- case Builtin::BIstrlcpy:
- case Builtin::BIstrlcat:
- return TaintPropagationRule(1, 2, 0, false);
+// case Builtin::BIstrlcpy:
+// case Builtin::BIstrlcat:
+// return TaintPropagationRule(1, 2, 0, false);
case Builtin::BIstrndup:
return TaintPropagationRule(0, 1, ReturnValueIndex);