mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-01 04:43:27 +00:00
1a6e16bcb1
- initscript: add status, PIDFILE and xconsole - syslog-ng.conf: dump the version - Fix some memory leak problems we found - Some backport patches - scl: fix wrong ownership issue - libnet: add libnet enable option and add it in PACKAGECONFIG - add HOMEPAGE - remove INC_PR - change some config into PACKAGECONFIG - add PACKAGE syslog-ng-libs to fix QA issue - use volatiles - inherit update-rc.d and update-alternative Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
39 lines
963 B
Diff
39 lines
963 B
Diff
Verify the validity of the pointer before delete it
|
|
|
|
Otherwise, we got a crash at logqueue-fifo.c:344
|
|
344 iv_list_del(&node->list);
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com>
|
|
---
|
|
--- a/lib/logqueue-fifo.c
|
|
+++ b/lib/logqueue-fifo.c
|
|
@@ -339,15 +339,18 @@
|
|
*msg = node->msg;
|
|
path_options->ack_needed = node->ack_needed;
|
|
self->qoverflow_output_len--;
|
|
- if (!push_to_backlog)
|
|
+ if ((&node->list) && (&node->list)->next && (&node->list)->prev)
|
|
{
|
|
- iv_list_del(&node->list);
|
|
- log_msg_free_queue_node(node);
|
|
- }
|
|
- else
|
|
- {
|
|
- iv_list_del_init(&node->list);
|
|
- }
|
|
+ if (!push_to_backlog)
|
|
+ {
|
|
+ iv_list_del(&node->list);
|
|
+ log_msg_free_queue_node(node);
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ iv_list_del_init(&node->list);
|
|
+ }
|
|
+ }
|
|
}
|
|
else
|
|
{
|