summaryrefslogtreecommitdiffstats
path: root/libasm
diff options
context:
space:
mode:
Diffstat (limited to 'libasm')
-rw-r--r--libasm/ChangeLog5
-rw-r--r--libasm/asm_begin.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/libasm/ChangeLog b/libasm/ChangeLog
index beb6211c..a8ac2c7c 100644
--- a/libasm/ChangeLog
+++ b/libasm/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-12 Mark Wielaard <[email protected]>
+
+ * asm_begin.c (prepare_text_output): Only call __fsetlocking when
+ result isn't NULL.
+
2015-10-05 Josh Stone <[email protected]>
* Makefile.am (libasm.so): Add AM_V_CCLD and AM_V_at silencers.
diff --git a/libasm/asm_begin.c b/libasm/asm_begin.c
index ff4d94c2..dc83cd8b 100644
--- a/libasm/asm_begin.c
+++ b/libasm/asm_begin.c
@@ -58,8 +58,8 @@ prepare_text_output (AsmCtx_t *result)
free (result);
result = NULL;
}
-
- __fsetlocking (result->out.file, FSETLOCKING_BYCALLER);
+ else
+ __fsetlocking (result->out.file, FSETLOCKING_BYCALLER);
}
return result;