Commit 69b1527a authored by Alejandro Homs Puron's avatar Alejandro Homs Puron

Merge branch 'softbufferctrlobj_bad_pointer' into 'master'

m_buffer_cb_mgr set to NULL if buffer_alloc_mgr is NULL

See merge request !130
parents 1f2d85c2 ea3948e8
Pipeline #12230 passed with stages
in 24 minutes and 42 seconds
......@@ -733,7 +733,7 @@ SoftBufferCtrlObj::SoftBufferCtrlObj(BufferAllocMgrPtr buffer_alloc_mgr)
: HwBufferCtrlObj(),
m_buffer_alloc_mgr(buffer_alloc_mgr ? buffer_alloc_mgr :
new SoftBufferAllocMgr),
m_buffer_cb_mgr(*buffer_alloc_mgr), m_mgr(m_buffer_cb_mgr),
m_buffer_cb_mgr(*m_buffer_alloc_mgr), m_mgr(m_buffer_cb_mgr),
m_acq_frame_nb(-1)
{
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment