X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Ftrace-handle.c;h=0da565b02000e230eb9322dbc34bc3dffe5c0f5e;hp=5058d37318f1fdb37148f82e9f4eb37bcf9a4a19;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=03798a93f959f6c694fe98f5647481947607c604

diff --git a/lib/trace-handle.c b/lib/trace-handle.c
index 5058d373..0da565b0 100644
--- a/lib/trace-handle.c
+++ b/lib/trace-handle.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 <stdint.h>
@@ -31,6 +39,9 @@ struct bt_trace_handle *bt_trace_handle_create(struct bt_context *ctx)
 {
 	struct bt_trace_handle *th;
 
+	if (!ctx)
+		return NULL;
+
 	th = g_new0(struct bt_trace_handle, 1);
 	th->id = ctx->last_trace_handle_id++;
 	return th;
@@ -38,11 +49,15 @@ struct bt_trace_handle *bt_trace_handle_create(struct bt_context *ctx)
 
 void bt_trace_handle_destroy(struct bt_trace_handle *th)
 {
+	th->format->close_trace(th->td);
 	g_free(th);
 }
 
 int bt_trace_handle_get_id(struct bt_trace_handle *th)
 {
+	if (!th)
+		return -1;
+
 	return th->id;
 }
 
@@ -50,6 +65,9 @@ const char *bt_trace_handle_get_path(struct bt_context *ctx, int handle_id)
 {
 	struct bt_trace_handle *handle;
 
+	if (!ctx)
+		return NULL;
+
 	handle = g_hash_table_lookup(ctx->trace_handles,
 			(gpointer) (unsigned long) handle_id);
 	if (!handle)
@@ -63,6 +81,9 @@ uint64_t bt_trace_handle_get_timestamp_begin(struct bt_context *ctx,
 	struct bt_trace_handle *handle;
 	uint64_t ret;
 
+	if (!ctx)
+		return -1ULL;
+
 	handle = g_hash_table_lookup(ctx->trace_handles,
 			(gpointer) (unsigned long) handle_id);
 	if (!handle) {
@@ -87,6 +108,9 @@ uint64_t bt_trace_handle_get_timestamp_end(struct bt_context *ctx,
 	struct bt_trace_handle *handle;
 	uint64_t ret;
 
+	if (!ctx)
+		return -1ULL;
+
 	handle = g_hash_table_lookup(ctx->trace_handles,
 			(gpointer) (unsigned long) handle_id);
 	if (!handle) {