X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fiterator.c;h=0534d013acc601220dd41986aea26805a7169d88;hb=dcaa2e7d2902fbc35f1a8df30421c6d43bf15e8e;hp=0ac041910f7aedf9d967600efd24e718318b6891;hpb=f60efc0e475b3c2fca3b2afc584615f6c482c9e7;p=babeltrace.git diff --git a/formats/ctf/iterator.c b/formats/ctf/iterator.c index 0ac04191..0534d013 100644 --- a/formats/ctf/iterator.c +++ b/formats/ctf/iterator.c @@ -17,6 +17,14 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include @@ -47,7 +55,8 @@ struct bt_ctf_iter *bt_ctf_iter_create(struct bt_context *ctx, g_free(iter); return NULL; } - iter->callbacks = g_array_new(0, 1, sizeof(struct bt_stream_callbacks)); + iter->callbacks = g_array_new(FALSE, TRUE, + sizeof(struct bt_stream_callbacks)); iter->recalculate_dep_graph = 0; iter->main_callbacks.callback = NULL; iter->dep_gc = g_ptr_array_new(); @@ -81,6 +90,8 @@ void bt_ctf_iter_destroy(struct bt_ctf_iter *iter) } g_array_free(bt_stream_cb->per_id_callbacks, TRUE); } + g_array_free(iter->callbacks, TRUE); + g_ptr_array_free(iter->dep_gc, TRUE); bt_iter_fini(&iter->parent); g_free(iter);