Skip to content

Feature/etcdlib fix #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 16, 2019
Merged

Feature/etcdlib fix #134

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a818ae
Merge pull request #1 from apache/develop
dhbfischer Sep 10, 2019
b6d57c0
Merge remote-tracking branch 'upstream/develop' into develop
dhbfischer Sep 28, 2019
61c67b1
Merge remote-tracking branch 'upstream/develop' into develop
dhbfischer Oct 21, 2019
70b7d74
Merge remote-tracking branch 'upstream/develop' into develop
dhbfischer Dec 16, 2019
75441d7
Fix for possible null pointer for the modified index in the etcdlib_g…
dhbfischer Dec 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions libs/etcdlib/src/etcd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,20 @@ int etcdlib_get_directory(const etcdlib_t *etcdlib, const char* directory, etcdl
fprintf(stderr, "[ETCDLIB] Error: %s in js_root not found", ETCD_JSON_NODE);
}
if (js_rootnode != NULL) {
*modifiedIndex = 0;
retVal = etcd_get_recursive_values(js_rootnode, callback, arg, (json_int_t*)modifiedIndex);
long long modIndex = 0;
long long *ptrModIndex = NULL;
if(modifiedIndex != NULL) {
*modifiedIndex = 0;
ptrModIndex = modifiedIndex;
} else {
ptrModIndex = &modIndex;
}
retVal = etcd_get_recursive_values(js_rootnode, callback, arg, (json_int_t*)ptrModIndex);
long long indexFromHeader = etcd_get_current_index(reply.header);
if (indexFromHeader > *modifiedIndex) {
*modifiedIndex = indexFromHeader;
if (indexFromHeader > *ptrModIndex) {
*ptrModIndex = indexFromHeader;
}
} else {
} else if (modifiedIndex != NULL) {
// Error occurred, retrieve the index of ETCD from the error code
js_rootnode = json_object_get(js_root, ETCD_JSON_INDEX);
if(js_rootnode) {
Expand All @@ -294,7 +301,6 @@ int etcdlib_get_directory(const etcdlib_t *etcdlib, const char* directory, etcdl

} else {
fprintf(stderr, "[ETCDLIB] Error: index not found in error %s\n", reply.memory);

}

}
Expand Down