diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-05-22 18:24:25 +0200 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 16:32:40 +0200 |
commit | 4ce69f7403811819800e7c5ae1318b2647e778d1 (patch) | |
tree | 2ec3a98b5abef002670a0916354eb7e0abfe2aa2 /chromium/sandbox | |
parent | a6dd70e0328d155d5df8d6df48afbab690b08fb6 (diff) | |
download | qtwebengine-chromium-4ce69f7403811819800e7c5ae1318b2647e778d1.tar.gz |
Update Chromium snapshot to stable version 33.0.1750.170
This is meant as a baseline commit hence it does not
include the patches we need to apply for QtWebEngine.
All patches should be rebased on top of this commit
so we can get rid of the external patches directory.
In future these baseline commits always have to include
the exact Chromium version returned by version_resolver.py's
currentVersion() in their first line, so that we can
retrieve the patches on top to apply on the upstream
repository. This also includes a ninja update.
Change-Id: I60abeadb785a3b7d149c58b65ddb5a823fed3083
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/sandbox')
-rw-r--r-- | chromium/sandbox/linux/services/libc_urandom_override.cc | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/chromium/sandbox/linux/services/libc_urandom_override.cc b/chromium/sandbox/linux/services/libc_urandom_override.cc index 6e8e12995a4..c5c49bac8ca 100644 --- a/chromium/sandbox/linux/services/libc_urandom_override.cc +++ b/chromium/sandbox/linux/services/libc_urandom_override.cc @@ -121,6 +121,8 @@ static void InitLibcFileIOFunctions() { // the code below defines fopen_override() function with asm name // "fopen", so that all references to fopen() will resolve to this // function. +__attribute__ ((__visibility__("default"))) +FILE* fopen_override(const char* path, const char* mode) __asm__ ("fopen"); __attribute__ ((__visibility__("default"))) FILE* fopen_override(const char* path, const char* mode) { @@ -139,7 +141,7 @@ FILE* fopen_override(const char* path, const char* mode) { } __attribute__ ((__visibility__("default"))) -FILE* fopen64_override(const char* path, const char* mode) { +FILE* fopen64(const char* path, const char* mode) { if (g_override_urandom && strcmp(path, kUrandomDevPath) == 0) { int fd = HANDLE_EINTR(dup(base::GetUrandomFD())); if (fd < 0) { @@ -160,6 +162,11 @@ FILE* fopen64_override(const char* path, const char* mode) { #if HAVE_XSTAT __attribute__ ((__visibility__("default"))) +int xstat_override(int version, + const char *path, + struct stat *buf) __asm__ ("__xstat"); + +__attribute__ ((__visibility__("default"))) int xstat_override(int version, const char *path, struct stat *buf) { if (g_override_urandom && strcmp(path, kUrandomDevPath) == 0) { int result = __fxstat(version, base::GetUrandomFD(), buf); @@ -172,6 +179,11 @@ int xstat_override(int version, const char *path, struct stat *buf) { } __attribute__ ((__visibility__("default"))) +int xstat64_override(int version, + const char *path, + struct stat64 *buf) __asm__ ("__xstat64"); + +__attribute__ ((__visibility__("default"))) int xstat64_override(int version, const char *path, struct stat64 *buf) { if (g_override_urandom && strcmp(path, kUrandomDevPath) == 0) { int result = __fxstat64(version, base::GetUrandomFD(), buf); @@ -186,6 +198,10 @@ int xstat64_override(int version, const char *path, struct stat64 *buf) { #else __attribute__ ((__visibility__("default"))) +int stat_override(const char *path, + struct stat *buf) __asm__ ("stat"); + +__attribute__ ((__visibility__("default"))) int stat_override(const char *path, struct stat *buf) { if (g_override_urandom && strcmp(path, kUrandomDevPath) == 0) { int result = fstat(base::GetUrandomFD(), buf); @@ -198,6 +214,10 @@ int stat_override(const char *path, struct stat *buf) { } __attribute__ ((__visibility__("default"))) +int stat64_override(const char *path, + struct stat64 *buf) __asm__ ("stat64"); + +__attribute__ ((__visibility__("default"))) int stat64_override(const char *path, struct stat64 *buf) { if (g_override_urandom && strcmp(path, kUrandomDevPath) == 0) { int result = fstat64(base::GetUrandomFD(), buf); |