diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-23 22:12:23 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-23 22:12:23 +0100 |
| commit | 5c75b65ca15f7c71babd835a45b252fed6534acf (patch) | |
| tree | 6b8baa3f5d27c4eafd89fece7deedae30a6ff1fd /source3/locking/posix.c | |
| parent | 86cee0b28c50dd849fe919bbe3faa4deba5275bf (diff) | |
| parent | ff26cb4b1c1d0292231e1cfc0490f4be6040d3e3 (diff) | |
| download | samba-5c75b65ca15f7c71babd835a45b252fed6534acf.tar.gz samba-5c75b65ca15f7c71babd835a45b252fed6534acf.tar.xz samba-5c75b65ca15f7c71babd835a45b252fed6534acf.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/locking/posix.c')
| -rw-r--r-- | source3/locking/posix.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source3/locking/posix.c b/source3/locking/posix.c index c036ee597c..9b51c3aa6a 100644 --- a/source3/locking/posix.c +++ b/source3/locking/posix.c @@ -909,13 +909,12 @@ new: start=%.0f,size=%.0f\n", (double)l_curr->start, (double)l_curr->size, */ char *msg = NULL; - /* Don't check if alloc succeeds here - we're - * forcing a core dump anyway. */ - - asprintf(&msg, "logic flaw in cases: l_curr: start = %.0f, size = %.0f : \ -lock: start = %.0f, size = %.0f", (double)l_curr->start, (double)l_curr->size, (double)lock->start, (double)lock->size ); - - smb_panic(msg); + if (asprintf(&msg, "logic flaw in cases: l_curr: start = %.0f, size = %.0f : \ +lock: start = %.0f, size = %.0f", (double)l_curr->start, (double)l_curr->size, (double)lock->start, (double)lock->size ) != -1) { + smb_panic(msg); + } else { + smb_panic("posix_lock_list"); + } } } /* end for ( l_curr = lhead; l_curr;) */ } /* end for (i=0; i<num_locks && ul_head; i++) */ |