X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fserialize.c;h=fc3cd312a12f08e20ea1af1d2cee85a764cff2c9;hb=8ff0fd08d6e1cc97cdb7e94b7cd97dc28c29e674;hp=dc23cac45c5b7f8ba5a0f1bb1f5da74cd778a8df;hpb=881bb3ee9aa6088415461f6efdb04c3638af1a22;p=bluesky.git

diff --git a/bluesky/serialize.c b/bluesky/serialize.c
index dc23cac..fc3cd31 100644
--- a/bluesky/serialize.c
+++ b/bluesky/serialize.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.
  */
 
 #include <stdint.h>
@@ -313,6 +335,13 @@ void bluesky_deserialize_cloudlog(BlueSkyCloudLog *item,
         g_assert(data3 + len3 - data <= len);
         item->type = header->type - '0';
         item->inum = GUINT64_FROM_LE(header->inum);
+    } else {
+        g_warning("Deserializing garbage cloud log item!");
+        return;
+    }
+
+    if (memcmp(&id, &item->id, sizeof(BlueSkyCloudID)) != 0) {
+        g_warning("ID does not match expected value!\n");
     }
 
     BlueSkyFS *fs = item->fs;