Skip to content

[3.6] bpo-35214: Disable getc_unlocked() with MemorySanitizer. (GH-10499) #10501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 1 commit into from
Nov 13, 2018
+2 −1
Merged

[3.6] bpo-35214: Disable getc_unlocked() with MemorySanitizer. (GH-10499) #10501

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Disable getc_unlocked() with MemorySanitizer. (GH-10499) 
clang's MemorySanitizer understand getc() but does not understand
getc_unlocked().  Workaround: Don't use it on msan builds.
(cherry picked from commit e6c77d8)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
  • Loading branch information
@gpshead @miss-islington
gpshead authored and miss-islington committed Nov 13, 2018
commit d8d997bed6d821bd4d9d5781118fea500992edf9
3 changes: 2 additions & 1 deletion Objects/fileobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
#define PY_SSIZE_T_CLEAN
#include "Python.h"

#ifdef HAVE_GETC_UNLOCKED
#if defined(HAVE_GETC_UNLOCKED) && !defined(MEMORY_SANITIZER)
/* clang MemorySanitizer doesn't yet understand getc_unlocked. */
#define GETC(f) getc_unlocked(f)
#define FLOCKFILE(f) flockfile(f)
#define FUNLOCKFILE(f) funlockfile(f)
Expand Down