Skip to content

Instantly share code, notes, and snippets.

@RichardWithnell
Last active August 29, 2015 14:16
Show Gist options
  • Save RichardWithnell/3f480c240ef9f5573230 to your computer and use it in GitHub Desktop.
Save RichardWithnell/3f480c240ef9f5573230 to your computer and use it in GitHub Desktop.
NS3 DCE diff
diff -r 0baf57dd8f75 model/dce-string.cc
--- a/model/dce-string.cc Sun Feb 01 21:26:05 2015 +0900
+++ b/model/dce-string.cc Mon Mar 02 02:38:51 2015 +0000
@@ -19,6 +19,22 @@
return str;
}
+unsigned long long dce___strtoull_internal(const char * __nptr,
+ char * * __endptr,
+ int __base,
+ int __group)
+{
+ return strtoull (__nptr, __endptr, __base);
+}
+
+char * dce___strncpy_chk (char *__restrict __dest,
+ const char *__restrict __src,
+ size_t __len, size_t __destlen)
+{
+ return strncpy (__dest, __src, __len);
+}
+
char * dce___strcpy_chk (char *__restrict __dest,
const char *__restrict __src,
size_t __destlen)
diff -r 0baf57dd8f75 model/dce-string.h
--- a/model/dce-string.h Sun Feb 01 21:26:05 2015 +0900
+++ b/model/dce-string.h Mon Mar 02 02:38:51 2015 +0000
@@ -12,6 +12,12 @@
char * dce___strcpy_chk (char *__restrict __dest,
const char *__restrict __src,
size_t __destlen);
+char * dce___strncpy_chk (char *__restrict __dest,
+ const char *__restrict __src,
+ size_t __len, size_t __destlen);
+
+unsigned long long dce___strtoull_internal(const char * __nptr, char * * __endptr, int __base, int __group);
+
char * dce_strpbrk (const char *s, const char *accept);
char * dce_strstr (const char *h, const char *n);
diff -r 0baf57dd8f75 model/libc-dce.cc
--- a/model/libc-dce.cc Sun Feb 01 21:26:05 2015 +0900
+++ b/model/libc-dce.cc Mon Mar 02 02:38:51 2015 +0000
@@ -116,6 +116,15 @@
extern char * __strcpy_chk (char *__restrict __dest,
const char *__restrict __src,
size_t __destlen);
+
+extern char * __strncpy_chk (char *__restrict __dest,
+ const char *__restrict __src,
+ size_t __len, size_t __destlen);
+
+extern unsigned long long __strtoull_internal(const char * __nptr,
+ char * * __endptr,
+ int __base, int __group);
+
// from glibc's stdio.h
extern int __sprintf_chk (char *, int, size_t, const char *, ...) __THROW;
extern int __snprintf_chk (char *, size_t, int, size_t, const char *, ...)
diff -r 0baf57dd8f75 model/libc-ns3.h
--- a/model/libc-ns3.h Sun Feb 01 21:26:05 2015 +0900
+++ b/model/libc-ns3.h Mon Mar 02 02:38:51 2015 +0000
@@ -590,6 +590,8 @@
DCE (__fpending)
DCE (__strcpy_chk)
+DCE (__strncpy_chk)
+DCE (__strtoull_internal)
DCE (__printf_chk)
DCE (__vfprintf_chk)
DCE (__fprintf_chk)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment