Skip to content

Commit 9bf2c51

Browse files
committed
in_splunk: small fixes on return values (CID 508015 508060 510619)
Signed-off-by: Eduardo Silva <[email protected]>
1 parent 987cccd commit 9bf2c51

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

plugins/in_splunk/splunk_prot.c

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -524,10 +524,10 @@ static int validate_auth_header(struct flb_splunk *ctx, struct mk_http_request *
524524

525525
ret = SPLUNK_AUTH_UNAUTHORIZED;
526526
flb_sds_destroy(authorization);
527-
528527
return ret;
529528
}
530529
else {
530+
flb_sds_destroy(authorization);
531531
return SPLUNK_AUTH_MISSING_CRED;
532532
}
533533

@@ -710,7 +710,7 @@ int splunk_prot_handle(struct flb_splunk *ctx, struct splunk_conn *conn,
710710
char *uri;
711711
char *qs;
712712
char *original_data = NULL;
713-
size_t original_data_size;
713+
size_t original_data_size = 0;
714714
char *out_chunked = NULL;
715715
size_t out_chunked_size = 0;
716716
off_t diff;
@@ -1145,7 +1145,7 @@ int splunk_prot_handle_ng(struct flb_http_request *request,
11451145
struct flb_http_response *response)
11461146
{
11471147
struct flb_splunk *context;
1148-
int ret;
1148+
int ret = -1;
11491149
flb_sds_t tag;
11501150

11511151
context = (struct flb_splunk *) response->stream->user_data;
@@ -1210,40 +1210,33 @@ int splunk_prot_handle_ng(struct flb_http_request *request,
12101210
if (strcasecmp(request->path, "/services/collector/raw/1.0") == 0 ||
12111211
strcasecmp(request->path, "/services/collector/raw") == 0) {
12121212
ret = process_hec_raw_payload_ng(request, response, tag, context);
1213-
12141213
if (ret != 0) {
12151214
send_json_message_response_ng(response, 400, "{\"text\":\"Invalid data format\",\"code\":6}");
1215+
ret = -1;
12161216
}
12171217
else {
12181218
send_json_message_response_ng(response, 200, "{\"text\":\"Success\",\"code\":0}");
1219+
ret = 0;
12191220
}
1220-
1221-
ret = 0;
12221221
}
12231222
else if (strcasecmp(request->path, "/services/collector/event/1.0") == 0 ||
12241223
strcasecmp(request->path, "/services/collector/event") == 0 ||
12251224
strcasecmp(request->path, "/services/collector") == 0) {
12261225
ret = process_hec_payload_ng(request, response, tag, context);
1227-
12281226
if (ret != 0) {
12291227
send_json_message_response_ng(response, 400, "{\"text\":\"Invalid data format\",\"code\":6}");
1230-
12311228
ret = -1;
12321229
}
12331230
else {
12341231
send_json_message_response_ng(response, 200, "{\"text\":\"Success\",\"code\":0}");
1232+
ret = 0;
12351233
}
1236-
1237-
ret = 0;
12381234
}
12391235
else {
12401236
send_response_ng(response, 400, "error: invalid HTTP endpoint\n");
1241-
12421237
ret = -1;
12431238
}
12441239

12451240
flb_sds_destroy(tag);
1246-
1247-
12481241
return ret;
12491242
}

0 commit comments

Comments
 (0)