diff options
author | Leon Scroggins <scroggo@google.com> | 2017-05-23 13:29:14 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-23 13:55:13 +0000 |
commit | 564ad05f065297658e691315993610e8055295c1 (patch) | |
tree | 07c6e726975a962e06550519cedcbb04cc2c25b7 /src/ports/SkOSFile_posix.cpp | |
parent | 92de631edd3eb9b3430332d1f1d566e903ea2ea9 (diff) |
Revert "sk_fgetsize to not use ftell."
This reverts commit eefa289a214ea3917e5e00554f231adb5ad6f712.
Reason for revert: Causing failures in BitmapFactoryTest. b/38233042
Original change's description:
> sk_fgetsize to not use ftell.
>
> The previous version of sk_fgetsize used ftell and fseek to compute
> the size of a file. There are so many issues with this that it is called
> out by securecoding.cert.org as FIO19-C as a thing not to do. We already
> have correct code for computing the size of a file in the mmap code, so
> use that instead.
>
> Change-Id: I1d771124989d0ec1523f6d858814ee563263213a
> Reviewed-on: https://skia-review.googlesource.com/9860
> Reviewed-by: Leon Scroggins <scroggo@google.com>
> Commit-Queue: Ben Wagner <bungeman@google.com>
>
TBR=bungeman@google.com,scroggo@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: Ie9392dde8747ae7c74ebfa00153705e316e841a2
Reviewed-on: https://skia-review.googlesource.com/17705
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/ports/SkOSFile_posix.cpp')
-rw-r--r-- | src/ports/SkOSFile_posix.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/ports/SkOSFile_posix.cpp b/src/ports/SkOSFile_posix.cpp index 40028246ff..48b5b95ad3 100644 --- a/src/ports/SkOSFile_posix.cpp +++ b/src/ports/SkOSFile_posix.cpp @@ -19,25 +19,6 @@ #include <sys/types.h> #include <unistd.h> -size_t sk_fgetsize(FILE* f) { - int fd = fileno(f); - if (fd < 0) { - return 0; - } - - struct stat status; - if (0 != fstat(fd, &status)) { - return 0; - } - if (!S_ISREG(status.st_mode)) { - return 0; - } - if (!SkTFitsIn<size_t>(status.st_size)) { - return 0; - } - return static_cast<size_t>(status.st_size); -} - bool sk_exists(const char *path, SkFILE_Flags flags) { int mode = F_OK; if (flags & kRead_SkFILE_Flag) { |