diff options
| author | Stephen Hines <srhines@google.com> | 2016-04-26 01:23:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-04-26 01:23:54 +0000 |
| commit | fb911ef00d0d78acf86c74a73c7c5a6ff600b0b2 (patch) | |
| tree | 2a1efac90de9462d8b111a78511f5e3104965e80 | |
| parent | 7d86a89a16598fe21fc25d8c99eed182e39848a9 (diff) | |
| parent | 5f7649cd94fdf97a6891e94cb4584af377323b20 (diff) | |
| download | mdnsresponder-nougat-mr1-wear-release.tar.gz | |
Merge changes I9aff8b78,I75c2f919android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
* changes:
Enable builds with Clang.
Switch to a volatile store to a NULL pointer.
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | mDNSShared/uds_daemon.c | 2 |
2 files changed, 1 insertions, 7 deletions
@@ -34,12 +34,6 @@ commonFlags := \ include $(CLEAR_VARS) -# uds_daemon.c explicitly dereferences a non-volatile null pointer. Clang rather -# unhelpfully says "I know what you're trying to do, but I'm going to optimize -# it away anyway". There's no way to disable this behavior, so just stick with -# gcc. -LOCAL_CLANG := false - LOCAL_SRC_FILES := mDNSPosix/PosixDaemon.c \ mDNSPosix/mDNSPosix.c \ mDNSPosix/mDNSUNP.c \ diff --git a/mDNSShared/uds_daemon.c b/mDNSShared/uds_daemon.c index 59a76c9..ad5f943 100644 --- a/mDNSShared/uds_daemon.c +++ b/mDNSShared/uds_daemon.c @@ -287,7 +287,7 @@ mDNSexport DNameListElem *AutoBrowseDomains; // List created from those local-o mDNSlocal void FatalError(char *errmsg) { LogMsg("%s: %s", errmsg, dnssd_strerror(dnssd_errno)); - *(long*)0 = 0; // On OS X abort() doesn't generate a crash log, but writing to zero does + *(volatile long*)0 = 0; // On OS X abort() doesn't generate a crash log, but writing to zero does abort(); // On platforms where writing to zero doesn't generate an exception, abort instead } |