packages/dbus-broker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!38 [sync] PR-37: fix buffer leakage

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot 2023-10-11 05:50:03 +00:00 committed by Gitee
commit 0d3d4af282
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
add-unit-test-for-dbus-broker.patch
View File

@ -209,7 +209,7 @@ index 0000000..e287647
+ +
+ int i = 0; + int i = 0;
+ while (true) { + while (true) {
+ list1 = extract_word_inlist(list1, &res); + list1 = extract_word_inlist(list1, &res, 1);
+ if (!list1) + if (!list1)
+ break; + break;
+ c_assert(!strcmp(res, res1[i++])); + c_assert(!strcmp(res, res1[i++]));
@ -217,7 +217,7 @@ index 0000000..e287647
+ +
+ i = 0; + i = 0;
+ while (true) { + while (true) {
+ list2 = extract_word_inlist(list2, &res); + list2 = extract_word_inlist(list2, &res, 3);
+ if (!list2) + if (!list2)
+ break; + break;
+ c_assert(!strcmp(res, res2[i++])); + c_assert(!strcmp(res, res2[i++]));

5
dbus-broker.spec
View File

@ -1,6 +1,6 @@
Name: dbus-broker Name: dbus-broker
Version: 29 Version: 29
Release: 8 Release: 9
Summary: Linux D-Bus Message Broker Summary: Linux D-Bus Message Broker
License: Apache License 2.0 License: Apache License 2.0
URL: https://github.com/bus1/dbus-broker URL: https://github.com/bus1/dbus-broker
@ -95,6 +95,9 @@ fi
%{_userunitdir}/dbus-broker.service %{_userunitdir}/dbus-broker.service
%changelog %changelog
* Sat Oct 7 2023 hongjinghao<hongjinghao@huawei.com> - 29-9
- Fix buffer leakage
* Wed Aug 9 2023 hongjinghao<hongjinghao@huawei.com> - 29-8 * Wed Aug 9 2023 hongjinghao<hongjinghao@huawei.com> - 29-8
- sync patches from dbus-broker community - sync patches from dbus-broker community

8
enable-dbus-broker-to-reexecute.patch
View File

@ -864,7 +864,7 @@ index ce4584c..3f72dbf 100644
+ SASL_LENGTH_MAX}; + SASL_LENGTH_MAX};
+ for (int i = 0; i < _PEER_INDEX_MAX; i++) { + for (int i = 0; i < _PEER_INDEX_MAX; i++) {
+ char *tmp_str = malloc(tmp_str_length[i]); + char *tmp_str = malloc(tmp_str_length[i]);
+ peer_str = extract_word_inlist(peer_str, &tmp_str); + peer_str = extract_word_inlist(peer_str, &tmp_str, tmp_str_length[i]);
+ if (strlen(tmp_str) <= 0) { + if (strlen(tmp_str) <= 0) {
+ return error_origin(-EINVAL); + return error_origin(-EINVAL);
+ } + }
@ -2075,7 +2075,7 @@ index dfbdced..4016f98 100644
+@ret: value between ";"" +@ret: value between ";""
+input example: 1;2;3 +input example: 1;2;3
+output example: 1 => 2 => 3 (one by one) */ +output example: 1 => 2 => 3 (one by one) */
+char *extract_word_inlist(char *string, char **ret) { +char *extract_word_inlist(char *string, char **ret, int ret_length) {
+ int i = 0, length = strlen(string); + int i = 0, length = strlen(string);
+ bool found_value = false; + bool found_value = false;
+ while (i < length) { + while (i < length) {
@ -2092,7 +2092,7 @@ index dfbdced..4016f98 100644
+ } + }
+ i++; + i++;
+ } + }
+ if (!found_value) { + if (!found_value || ret_length < i) {
+ **ret = 0; + **ret = 0;
+ return NULL; + return NULL;
+ } + }
@ -2143,7 +2143,7 @@ index 14f7171..f1c7d10 100644
int util_strtou32(uint32_t *valp, const char *string); int util_strtou32(uint32_t *valp, const char *string);
int util_strtou64(uint64_t *valp, const char *string); int util_strtou64(uint64_t *valp, const char *string);
+void generate_args_string(bool valid_arg, char **ret, int size, int *cur_i, char *option, char *val); +void generate_args_string(bool valid_arg, char **ret, int size, int *cur_i, char *option, char *val);
+char *extract_word_inlist(char *string, char **ret); +char *extract_word_inlist(char *string, char **ret, int ret_length);
+char *extract_list_element(char *string, char **ret); +char *extract_list_element(char *string, char **ret);
/** /**