X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Fcommon%2Fmetadata%2Fdecoder.c;h=c39e79e36ec9ad4c5d58bcaa7f44a060ee54b702;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=763b0508a80742e69998a2705ffac20ece98ba2c;hpb=7bf5af54b2e6cf5ed45f3416f96d837a120467ca;p=babeltrace.git diff --git a/plugins/ctf/common/metadata/decoder.c b/plugins/ctf/common/metadata/decoder.c index 763b0508..c39e79e3 100644 --- a/plugins/ctf/common/metadata/decoder.c +++ b/plugins/ctf/common/metadata/decoder.c @@ -20,10 +20,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -33,7 +33,7 @@ #define TSDL_MAGIC 0x75d11d57 -BT_HIDDEN +extern int yydebug; struct ctf_metadata_decoder { @@ -103,6 +103,11 @@ int decode_packet(struct ctf_metadata_decoder *mdec, FILE *in_fp, FILE *out_fp, int ret = 0; const long offset = ftell(in_fp); + if (offset < 0) { + BT_LOGE_ERRNO("Failed to get current metadata file position", + "."); + goto error; + } BT_LOGV("Decoding metadata packet: mdec-addr=%p, offset=%ld", mdec, offset); readlen = fread(&header, sizeof(header), 1, in_fp); @@ -207,20 +212,28 @@ int decode_packet(struct ctf_metadata_decoder *mdec, FILE *in_fp, FILE *out_fp, toread = header.content_size / CHAR_BIT - sizeof(header); for (;;) { - readlen = fread(buf, sizeof(uint8_t), - MIN(sizeof(buf) - 1, toread), in_fp); + size_t loop_read; + + loop_read = MIN(sizeof(buf) - 1, toread); + readlen = fread(buf, sizeof(uint8_t), loop_read, in_fp); if (ferror(in_fp)) { BT_LOGE("Cannot read metadata packet buffer: " - "offset=%ld, read-size=%u", - ftell(in_fp), (unsigned int) readlen); + "offset=%ld, read-size=%zu", + ftell(in_fp), loop_read); + goto error; + } + if (readlen > loop_read) { + BT_LOGE("fread returned more byte than expected: " + "read-size-asked=%zu, read-size-returned=%zu", + loop_read, readlen); goto error; } writelen = fwrite(buf, sizeof(uint8_t), readlen, out_fp); if (writelen < readlen || ferror(out_fp)) { BT_LOGE("Cannot write decoded metadata text to buffer: " - "read-offset=%ld, write-size=%u", - ftell(in_fp), (unsigned int) readlen); + "read-offset=%ld, write-size=%zu", + ftell(in_fp), readlen); goto error; } @@ -291,6 +304,13 @@ int ctf_metadata_decoder_packetized_file_stream_to_buf_with_mdec( /* Close stream, which also flushes the buffer */ ret = bt_close_memstream(buf, &size, out_fp); + /* + * See fclose(3). Further access to out_fp after both success + * and error, even through another bt_close_memstream(), results + * in undefined behavior. Nullify out_fp to ensure we don't + * fclose it twice on error. + */ + out_fp = NULL; if (ret < 0) { BT_LOGE("Cannot close memory stream: %s: mdec-addr=%p", strerror(errno), mdec); @@ -328,8 +348,8 @@ int ctf_metadata_decoder_packetized_file_stream_to_buf( BT_HIDDEN struct ctf_metadata_decoder *ctf_metadata_decoder_create( - const struct ctf_metadata_decoder_config *config, - const char *name) + bt_self_component_source *self_comp, + const struct ctf_metadata_decoder_config *config) { struct ctf_metadata_decoder *mdec = g_new0(struct ctf_metadata_decoder, 1); @@ -344,9 +364,8 @@ struct ctf_metadata_decoder *ctf_metadata_decoder_create( BT_LOGD("Creating CTF metadata decoder: " "clock-class-offset-s=%" PRId64 ", " - "clock-class-offset-ns=%" PRId64 ", name=\"%s\"", - config->clock_class_offset_s, config->clock_class_offset_ns, - name); + "clock-class-offset-ns=%" PRId64, + config->clock_class_offset_s, config->clock_class_offset_ns); if (!mdec) { BT_LOGE_STR("Failed to allocate one CTF metadata decoder."); @@ -354,7 +373,7 @@ struct ctf_metadata_decoder *ctf_metadata_decoder_create( } mdec->config = *config; - mdec->visitor = ctf_visitor_generate_ir_create(config, name); + mdec->visitor = ctf_visitor_generate_ir_create(self_comp, config); if (!mdec->visitor) { BT_LOGE("Failed to create a CTF IR metadata AST visitor: " "mdec-addr=%p", mdec); @@ -365,10 +384,9 @@ struct ctf_metadata_decoder *ctf_metadata_decoder_create( BT_LOGD("Creating CTF metadata decoder: " "clock-class-offset-s=%" PRId64 ", " - "clock-class-offset-ns=%" PRId64 ", " - "name=\"%s\", addr=%p", + "clock-class-offset-ns=%" PRId64 ", addr=%p", config->clock_class_offset_s, config->clock_class_offset_ns, - name, mdec); + mdec); end: return mdec; @@ -397,7 +415,7 @@ enum ctf_metadata_decoder_status ctf_metadata_decoder_decode( char *buf = NULL; bool close_fp = false; - assert(mdec); + BT_ASSERT(mdec); if (ctf_metadata_decoder_is_packetized(fp, &mdec->bo)) { BT_LOGD("Metadata stream is packetized: mdec-addr=%p", mdec); @@ -431,6 +449,12 @@ enum ctf_metadata_decoder_status ctf_metadata_decoder_decode( BT_LOGD("Metadata stream is plain text: mdec-addr=%p", mdec); + if (init_pos < 0) { + BT_LOGE_ERRNO("Failed to get current file position", "."); + status = CTF_METADATA_DECODER_STATUS_ERROR; + goto end; + } + /* Check text-only metadata header and version */ nr_items = fscanf(fp, "/* CTF %10u.%10u", &major, &minor); if (nr_items < 2) { @@ -469,7 +493,7 @@ enum ctf_metadata_decoder_status ctf_metadata_decoder_decode( goto end; } - assert(fp); + BT_ASSERT(fp); ret = ctf_scanner_append_ast(scanner, fp); if (ret) { BT_LOGE("Cannot create the metadata AST out of the metadata text: " @@ -526,8 +550,15 @@ end: } BT_HIDDEN -struct bt_ctf_trace *ctf_metadata_decoder_get_trace( +bt_trace_class *ctf_metadata_decoder_get_ir_trace_class( + struct ctf_metadata_decoder *mdec) +{ + return ctf_visitor_generate_ir_get_ir_trace_class(mdec->visitor); +} + +BT_HIDDEN +struct ctf_trace_class *ctf_metadata_decoder_borrow_ctf_trace_class( struct ctf_metadata_decoder *mdec) { - return ctf_visitor_generate_ir_get_trace(mdec->visitor); + return ctf_visitor_generate_ir_borrow_ctf_trace_class(mdec->visitor); }