diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-06 17:27:37 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-06 17:27:37 +0100 |
| commit | 42d1d27a019f25bf39c1f424cd9fb23560728c58 (patch) | |
| tree | ebd6f6afb5e41bd8570ca5ca398deef518f60c8c /runtime/obj.c | |
| parent | 7df68798be96d38fcb17143daa2c3e2b093a8ba5 (diff) | |
| parent | 27e0f06b17b59e5de7db94ec1d0e74369536373a (diff) | |
| download | rsyslog-42d1d27a019f25bf39c1f424cd9fb23560728c58.tar.gz rsyslog-42d1d27a019f25bf39c1f424cd9fb23560728c58.tar.bz2 rsyslog-42d1d27a019f25bf39c1f424cd9fb23560728c58.zip | |
Merge branch 'v7-stable-newmsglock' into master-newmsglock
Conflicts:
runtime/msg.c
runtime/queue.c
tools/syslogd.c
Diffstat (limited to 'runtime/obj.c')
| -rw-r--r-- | runtime/obj.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/obj.c b/runtime/obj.c index 03d25cdc..99ccc923 100644 --- a/runtime/obj.c +++ b/runtime/obj.c @@ -921,7 +921,9 @@ objDeserializeWithMethods(void *ppObj, uchar *pszTypeExpected, int lenTypeExpect CHKiRet(fFixup(pObj, pUsr)); /* we have a valid object, let's finalize our work and return */ - CHKiRet(objConstructFinalize(pObj)); + if(objConstructFinalize != NULL) { + CHKiRet(objConstructFinalize(pObj)); + } *((obj_t**) ppObj) = pObj; |