aa4184eba9
Copy from network:ha-clustering:Factory/corosync based on submit request 42251 from user tserong OBS-URL: https://build.opensuse.org/request/show/42251 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/corosync?expand=0&rev=1
77 lines
2.6 KiB
Diff
77 lines
2.6 KiB
Diff
Index: trunk/exec/objdb.c
|
|
===================================================================
|
|
--- trunk/exec/objdb.c (revision 2786)
|
|
+++ trunk/exec/objdb.c (revision 2787)
|
|
@@ -1316,6 +1316,8 @@
|
|
goto error_exit;
|
|
free(object_key->value);
|
|
object_key->value = replacement_value;
|
|
+ memset (object_key->value, 0, new_value_len);
|
|
+ object_key->value_len = new_value_len;
|
|
}
|
|
if (memcmp (object_key->value, new_value, new_value_len) == 0) {
|
|
value_changed = 0;
|
|
Index: trunk/exec/coroipcs.c
|
|
===================================================================
|
|
--- trunk/exec/coroipcs.c (revision 2786)
|
|
+++ trunk/exec/coroipcs.c (revision 2787)
|
|
@@ -727,6 +727,7 @@
|
|
mar_res_setup_t res_setup;
|
|
unsigned int res;
|
|
|
|
+ memset (&res_setup, 0, sizeof (res_setup));
|
|
res_setup.error = error;
|
|
|
|
retry_send:
|
|
Index: trunk/exec/logsys.c
|
|
===================================================================
|
|
--- trunk/exec/logsys.c (revision 2786)
|
|
+++ trunk/exec/logsys.c (revision 2787)
|
|
@@ -731,6 +731,8 @@
|
|
int log_msg;
|
|
char buf[COMBINE_BUFFER_SIZE];
|
|
|
|
+ memset (buf, 0, sizeof (buf));
|
|
+
|
|
/*
|
|
* Signal wthread_create that the initialization process may continue
|
|
*/
|
|
@@ -1111,6 +1113,7 @@
|
|
return (-1);
|
|
}
|
|
|
|
+ memset (flt_data, 0, flt_real_size);
|
|
/*
|
|
* flt_data_size tracks data by ints and not bytes/chars.
|
|
*
|
|
Index: trunk/exec/main.c
|
|
===================================================================
|
|
--- trunk/exec/main.c (revision 2786)
|
|
+++ trunk/exec/main.c (revision 2787)
|
|
@@ -655,13 +655,12 @@
|
|
mtt_rx_token = (total_mtt_rx_token / token_count);
|
|
avg_backlog_calc = (total_backlog_calc / token_count);
|
|
avg_token_holdtime = (total_token_holdtime / token_count);
|
|
-
|
|
objdb->object_key_replace (stats->mrp->srp->hdr.handle,
|
|
"mtt_rx_token", strlen("mtt_rx_token"),
|
|
&mtt_rx_token, sizeof (mtt_rx_token));
|
|
objdb->object_key_replace (stats->mrp->srp->hdr.handle,
|
|
"avg_token_workload", strlen("avg_token_workload"),
|
|
- &avg_token_holdtime, sizeof (avg_backlog_calc));
|
|
+ &avg_token_holdtime, sizeof (avg_token_holdtime));
|
|
objdb->object_key_replace (stats->mrp->srp->hdr.handle,
|
|
"avg_backlog_calc", strlen("avg_backlog_calc"),
|
|
&avg_backlog_calc, sizeof (avg_backlog_calc));
|
|
@@ -782,8 +781,8 @@
|
|
"avg_token_workload", &zero_32,
|
|
sizeof (zero_32), OBJDB_VALUETYPE_UINT32);
|
|
objdb->object_key_create_typed (stats->mrp->srp->hdr.handle,
|
|
- "avg_backlog_calc", &zero_64,
|
|
- sizeof (zero_64), OBJDB_VALUETYPE_UINT64);
|
|
+ "avg_backlog_calc", &zero_32,
|
|
+ sizeof (zero_32), OBJDB_VALUETYPE_UINT32);
|
|
objdb->object_key_create_typed (stats->mrp->srp->hdr.handle,
|
|
"rx_msg_dropped", &zero_64,
|
|
sizeof (zero_64), OBJDB_VALUETYPE_UINT64);
|