X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Futil.c;h=5412963cefc31efd18f84ab18ad7d27d8e0a662a;hb=8ff0fd08d6e1cc97cdb7e94b7cd97dc28c29e674;hp=45bc9f5be8f9b04c9e95847be969f6838de208b1;hpb=f53cd8284a0461840cea01c7c6dbc875c52fac50;p=bluesky.git

diff --git a/bluesky/util.c b/bluesky/util.c
index 45bc9f5..5412963 100644
--- a/bluesky/util.c
+++ b/bluesky/util.c
@@ -3,7 +3,29 @@
  * Copyright (C) 2009  The Regents of the University of California
  * Written by Michael Vrable <mvrable@cs.ucsd.edu>
  *
- * TODO: Licensing
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 #define _GNU_SOURCE
@@ -83,6 +105,7 @@ BlueSkyRCStr *bluesky_string_new_from_mmap(BlueSkyCacheFile *mmap,
                                            int offset, gsize len)
 {
     g_assert(offset + len <= mmap->len);
+    g_assert(mmap->addr != NULL);
 
     BlueSkyRCStr *string = g_new(BlueSkyRCStr, 1);
     string->mmap = mmap;
@@ -349,21 +372,32 @@ typedef struct {
     char *message;
 } RTEvent;
 
+/* To catch attempts to access to invalid profile structures. */
+#define PROFILE_MAGIC 0x439929d8
+
+static FILE *profiling_file = NULL;
+
 BlueSkyProfile *bluesky_profile_new()
 {
     BlueSkyProfile *profile = g_new0(BlueSkyProfile, 1);
     profile->lock = g_mutex_new();
+    profile->magic = PROFILE_MAGIC;
     return profile;
 }
 
 void bluesky_profile_free(BlueSkyProfile *profile)
 {
+    if (profile->magic != PROFILE_MAGIC) {
+        g_warning("Access to invalid BlueSkyProfile object!");
+        return;
+    }
     while (profile->events != NULL) {
         RTEvent *event = (RTEvent *)profile->events->data;
         g_free(event->message);
         g_free(event);
         profile->events = g_list_delete_link(profile->events, profile->events);
     }
+    profile->magic = 0;
     g_mutex_free(profile->lock);
     g_free(profile->description);
     g_free(profile);
@@ -371,8 +405,15 @@ void bluesky_profile_free(BlueSkyProfile *profile)
 
 void bluesky_profile_add_event(BlueSkyProfile *profile, char *message)
 {
+    if (profiling_file == NULL)
+        return;
+
     g_return_if_fail(profile != NULL);
 
+    if (profile->magic != PROFILE_MAGIC) {
+        g_warning("Access to invalid BlueSkyProfile object!");
+        return;
+    }
     g_mutex_lock(profile->lock);
     RTEvent *event = g_new(RTEvent, 1);
     event->timestamp = bluesky_now_hires();
@@ -383,7 +424,6 @@ void bluesky_profile_add_event(BlueSkyProfile *profile, char *message)
     g_mutex_unlock(profile->lock);
 }
 
-static FILE *profiling_file = NULL;
 static GStaticMutex profiling_print_lock = G_STATIC_MUTEX_INIT;
 
 void bluesky_profile_set_output(FILE *stream)
@@ -393,9 +433,17 @@ void bluesky_profile_set_output(FILE *stream)
 
 void bluesky_profile_print(BlueSkyProfile *profile)
 {
-    FILE *stream = profiling_file ? profiling_file : stdout;
+    FILE *stream = profiling_file;
+    if (stream == NULL)
+        return;
+
     g_return_if_fail(profile != NULL);
 
+    if (profile->magic != PROFILE_MAGIC) {
+        g_warning("Access to invalid BlueSkyProfile object!");
+        return;
+    }
+
     g_mutex_lock(profile->lock);
     g_static_mutex_lock(&profiling_print_lock);
     fprintf(stream, "Event Timeline: %s\n", profile->description);