Merge branch 'master' of github.com:fluent/fluent-bit

Author: edsiper

plugins/out_cloudwatch_logs/cloudwatch_api.c

@@ -248,7 +248,7 @@ static int write_event(struct flb_cloudwatch *ctx, struct cw_flush *buf,
 {
     char ts[50];
 
-    if (!sprintf(ts, "%llu", event->timestamp)) {
+    if (!snprintf(ts, 50, "%llu", event->timestamp)) {
         goto error;
     }
 

plugins/out_stackdriver/stackdriver_http_request.c

@@ -185,16 +185,23 @@ void add_http_request_field(struct http_request_field *http_request,
 /* latency should be in the format:
  *      whitespace (opt.) + integer + point & decimal (opt.)
  *      + whitespace (opt.) + "s" + whitespace (opt.)
+ *
+ * latency is Duration, so the maximum value is "315576000000.999999999s".
+ * (23 characters in length)
  */
 static void validate_latency(msgpack_object_str latency_in_payload,
                              struct http_request_field *http_request) {
     flb_sds_t pattern = flb_sds_create("^\\s*\\d+(.\\d+)?\\s*s\\s*$");
-    char extract_latency[latency_in_payload.size];
+    char extract_latency[32];
     struct flb_regex *regex;
 
     int status = 0;
     int i = 0, j = 0;
 
+    if (latency_in_payload.size > sizeof(extract_latency)) {
+        return;
+    }
+
     regex = flb_regex_create(pattern);
     status = flb_regex_match(regex, latency_in_payload.ptr, latency_in_payload.size);
     flb_regex_destroy(regex);

src/flb_ra_key.c

@@ -78,6 +78,10 @@ static int ra_key_val_id(flb_sds_t ckey, msgpack_object map)
     int map_size;
     msgpack_object key;
 
+    if (map.type != MSGPACK_OBJECT_MAP) {
+        return -1;
+    }
+
     map_size = map.via.map.size;
     for (i = 0; i < map_size; i++) {
         key = map.via.map.ptr[i].key;

src/record_accessor/flb_ra_parser.c

@@ -224,12 +224,12 @@ struct flb_ra_parser *flb_ra_parser_string_create(char *str, int len)
         flb_ra_parser_destroy(rp);
         return NULL;
     }
+    rp->key->subkeys = NULL;
     rp->key->name = flb_sds_create_len(str, len);
     if (!rp->key->name) {
         flb_ra_parser_destroy(rp);
         return NULL;
     }
-    rp->key->subkeys = NULL;
 
     return rp;
 }