mongo_ext 0.18 → 0.18.1

data/Rakefile

@@ -10,19 +10,37 @@ rescue LoadError
 end
 require 'rbconfig'
 include Config
+ENV['TEST_MODE'] = 'TRUE'
 
 gem_command = "gem"
 gem_command = "gem1.9" if $0.match(/1\.9$/) # use gem1.9 if we used rake1.9
 
-# NOTE: the functional tests assume MongoDB is running.
 desc "Test the MongoDB Ruby driver."
 task :test do
-  Rake::Task['test:unit'].invoke
-  Rake::Task['test:functional'].invoke
-  Rake::Task['test:pooled_threading'].invoke
+  puts "\nThis option has changed."
+  puts "\nTo test the driver with the c-extensions:\nrake test:c\n"
+  puts "To test the pure ruby driver: \nrake test:ruby"
 end
 
-namespace :test do 
+namespace :test do
+
+  desc "Test the driver with the c extension enabled."
+  task :c do
+    ENV['C_EXT'] = 'TRUE'
+    Rake::Task['test:unit'].invoke
+    Rake::Task['test:functional'].invoke
+    Rake::Task['test:pooled_threading'].invoke
+    ENV['C_EXT'] = nil
+  end
+
+  desc "Test the driver using pure ruby (no c extension)"
+  task :ruby do
+    ENV['C_EXT'] = nil
+    Rake::Task['test:unit'].invoke
+    Rake::Task['test:functional'].invoke
+    Rake::Task['test:pooled_threading'].invoke
+  end
+
   Rake::TestTask.new(:unit) do |t|
     t.test_files = FileList['test/unit/*_test.rb']
     t.verbose    = true
@@ -79,7 +97,7 @@ namespace :gem do
   task :install do
     sh <<EOS
 #{gem_command} build mongo-ruby-driver.gemspec &&
-    sudo #{gem_command} install mongo-*.gem &&
+    #{gem_command} install mongo-*.gem &&
     rm mongo-*.gem
 EOS
   end
@@ -88,7 +106,7 @@ EOS
   task :install_extensions do
     sh <<EOS
 #{gem_command} build mongo-extensions.gemspec &&
-    sudo #{gem_command} install mongo_ext-*.gem &&
+    #{gem_command} install mongo_ext-*.gem &&
     rm mongo_ext-*.gem
 EOS
   end

data/ext/cbson/buffer.c

@@ -0,0 +1,135 @@
+/*
+ * Copyright 2009 10gen, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "buffer.h"
+
+#define INITIAL_BUFFER_SIZE 256
+
+struct buffer {
+    char* buffer;
+    int size;
+    int position;
+};
+
+/* Allocate and return a new buffer.
+ * Return NULL on allocation failure. */
+buffer_t buffer_new(void) {
+    buffer_t buffer;
+    buffer = (buffer_t)malloc(sizeof(struct buffer));
+    if (buffer == NULL) {
+        return NULL;
+    }
+
+    buffer->size = INITIAL_BUFFER_SIZE;
+    buffer->position = 0;
+    buffer->buffer = (char*)malloc(sizeof(char) * INITIAL_BUFFER_SIZE);
+    if (buffer->buffer == NULL) {
+        free(buffer);
+        return NULL;
+    }
+
+    return buffer;
+}
+
+/* Free the memory allocated for `buffer`.
+ * Return non-zero on failure. */
+int buffer_free(buffer_t buffer) {
+    if (buffer == NULL) {
+        return 1;
+    }
+    free(buffer->buffer);
+    free(buffer);
+    return 0;
+}
+
+/* Grow `buffer` to at least `min_length`.
+ * Return non-zero on allocation failure. */
+static int buffer_grow(buffer_t buffer, int min_length) {
+    int size = buffer->size;
+    char* old_buffer = buffer->buffer;
+    if (size >= min_length) {
+        return 0;
+    }
+    while (size < min_length) {
+        size *= 2;
+    }
+    buffer->buffer = (char*)realloc(buffer->buffer, sizeof(char) * size);
+    if (buffer->buffer == NULL) {
+        free(old_buffer);
+        free(buffer);
+        return 1;
+    }
+    buffer->size = size;
+    return 0;
+}
+
+/* Assure that `buffer` has at least `size` free bytes (and grow if needed).
+ * Return non-zero on allocation failure. */
+static int buffer_assure_space(buffer_t buffer, int size) {
+    if (buffer->position + size <= buffer->size) {
+        return 0;
+    }
+    return buffer_grow(buffer, buffer->position + size);
+}
+
+/* Save `size` bytes from the current position in `buffer` (and grow if needed).
+ * Return offset for writing, or -1 on allocation failure. */
+buffer_position buffer_save_space(buffer_t buffer, int size) {
+    int position = buffer->position;
+    if (buffer_assure_space(buffer, size) != 0) {
+        return -1;
+    }
+    buffer->position += size;
+    return position;
+}
+
+/* Write `size` bytes from `data` to `buffer` (and grow if needed).
+ * Return non-zero on allocation failure. */
+int buffer_write(buffer_t buffer, const char* data, int size) {
+    if (buffer_assure_space(buffer, size) != 0) {
+        return 1;
+    }
+
+    memcpy(buffer->buffer + buffer->position, data, size);
+    buffer->position += size;
+    return 0;
+}
+
+/* Write `size` bytes from `data` to `buffer` at position `position`.
+ * Does not change the internal position of `buffer`.
+ * Return non-zero if buffer isn't large enough for write. */
+int buffer_write_at_position(buffer_t buffer, buffer_position position,
+                             const char* data, int size) {
+    if (position + size > buffer->size) {
+        buffer_free(buffer);
+        return 1;
+    }
+
+    memcpy(buffer->buffer + position, data, size);
+    return 0;
+}
+
+
+int buffer_get_position(buffer_t buffer) {
+    return buffer->position;
+}
+
+char* buffer_get_buffer(buffer_t buffer) {
+    return buffer->buffer;
+}

data/ext/cbson/buffer.h

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2009 10gen, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef BUFFER_H
+#define BUFFER_H
+
+/* Note: if any of these functions return a failure condition then the buffer
+ * has already been freed. */
+
+/* A buffer */
+typedef struct buffer* buffer_t;
+/* A position in the buffer */
+typedef int buffer_position;
+
+/* Allocate and return a new buffer.
+ * Return NULL on allocation failure. */
+buffer_t buffer_new(void);
+
+/* Free the memory allocated for `buffer`.
+ * Return non-zero on failure. */
+int buffer_free(buffer_t buffer);
+
+/* Save `size` bytes from the current position in `buffer` (and grow if needed).
+ * Return offset for writing, or -1 on allocation failure. */
+buffer_position buffer_save_space(buffer_t buffer, int size);
+
+/* Write `size` bytes from `data` to `buffer` (and grow if needed).
+ * Return non-zero on allocation failure. */
+int buffer_write(buffer_t buffer, const char* data, int size);
+
+/* Write `size` bytes from `data` to `buffer` at position `position`.
+ * Does not change the internal position of `buffer`.
+ * Return non-zero if buffer isn't large enough for write. */
+int buffer_write_at_position(buffer_t buffer, buffer_position position, const char* data, int size);
+
+/* Getters for the internals of a buffer_t.
+ * Should try to avoid using these as much as possible
+ * since they break the abstraction. */
+buffer_position buffer_get_position(buffer_t buffer);
+char* buffer_get_buffer(buffer_t buffer);
+
+#endif

data/ext/cbson/cbson.c

@@ -36,12 +36,23 @@
 #include "regex.h"
 #endif
 
-#include <assert.h>
+#include <string.h>
 #include <math.h>
 #include <unistd.h>
 #include <time.h>
 
-#define INITIAL_BUFFER_SIZE 256
+#include "version.h"
+#include "buffer.h"
+#include "encoding_helpers.h"
+
+#define SAFE_WRITE(buffer, data, size)                                  \
+    if (buffer_write((buffer), (data), (size)) != 0)                    \
+        rb_raise(rb_eNoMemError, "failed to allocate memory in buffer.c")
+
+#define SAFE_WRITE_AT_POS(buffer, position, data, size)                 \
+    if (buffer_write_at_position((buffer), (position), (data), (size)) != 0) \
+        rb_raise(rb_eNoMemError, "failed to allocate memory in buffer.c")
+
 #define MAX_HOSTNAME_LENGTH 256
 
 static VALUE Binary;
@@ -52,13 +63,28 @@ static VALUE Code;
 static VALUE RegexpOfHolding;
 static VALUE OrderedHash;
 static VALUE InvalidName;
+static VALUE InvalidStringEncoding;
 static VALUE DigestMD5;
 
 #if HAVE_RUBY_ENCODING_H
 #include "ruby/encoding.h"
 #define STR_NEW(p,n) rb_enc_str_new((p), (n), rb_utf8_encoding())
+/* MUST call TO_UTF8 before calling write_utf8. */
+#define TO_UTF8(string) rb_str_export_to_enc((string), rb_utf8_encoding())
+static void write_utf8(buffer_t buffer, VALUE string) {
+    SAFE_WRITE(buffer, RSTRING_PTR(string), RSTRING_LEN(string));
+}
 #else
 #define STR_NEW(p,n) rb_str_new((p), (n))
+/* MUST call TO_UTF8 before calling write_utf8. */
+#define TO_UTF8(string) (string)
+static void write_utf8(buffer_t buffer, VALUE string) {
+    if (!is_legal_utf8_string(RSTRING_PTR(string), RSTRING_LEN(string))) {
+        buffer_free(buffer);
+        rb_raise(InvalidStringEncoding, "String not valid UTF-8");
+    }
+    SAFE_WRITE(buffer, RSTRING_PTR(string), RSTRING_LEN(string));
+}
 #endif
 
 // this sucks. but for some reason these moved around between 1.8 and 1.9
@@ -91,12 +117,6 @@ static VALUE DigestMD5;
 #define RREGEXP_SRC_LEN(r) RREGEXP(r)->len
 #endif
 
-typedef struct {
-    char* buffer;
-    int size;
-    int position;
-} bson_buffer;
-
 static char zero = 0;
 static char one = 1;
 
@@ -104,78 +124,23 @@ static int cmp_char(const void* a, const void* b) {
     return *(char*)a - *(char*)b;
 }
 
-static void write_doc(bson_buffer* buffer, VALUE hash, VALUE check_keys);
+static void write_doc(buffer_t buffer, VALUE hash, VALUE check_keys);
 static int write_element(VALUE key, VALUE value, VALUE extra);
 static VALUE elements_to_hash(const char* buffer, int max);
 
-static bson_buffer* buffer_new(void) {
-    bson_buffer* buffer;
-    buffer = ALLOC(bson_buffer);
-    assert(buffer);
-
-    buffer->size = INITIAL_BUFFER_SIZE;
-    buffer->position = 0;
-    buffer->buffer = ALLOC_N(char, INITIAL_BUFFER_SIZE);
-    assert(buffer->buffer);
-
-    return buffer;
-}
-
-static void buffer_free(bson_buffer* buffer) {
-    assert(buffer);
-    assert(buffer->buffer);
-
-    free(buffer->buffer);
-    free(buffer);
-}
-
-static void buffer_resize(bson_buffer* buffer, int min_length) {
-    int size = buffer->size;
-    if (size >= min_length) {
-        return;
-    }
-    while (size < min_length) {
-        size *= 2;
-    }
-    buffer->buffer = REALLOC_N(buffer->buffer, char, size);
-    assert(buffer->buffer);
-    buffer->size = size;
-}
-
-static void buffer_assure_space(bson_buffer* buffer, int size) {
-    if (buffer->position + size <= buffer->size) {
-        return;
-    }
-    buffer_resize(buffer, buffer->position + size);
-}
-
-/* returns offset for writing */
-static int buffer_save_bytes(bson_buffer* buffer, int size) {
-    int position = buffer->position;
-    buffer_assure_space(buffer, size);
-    buffer->position += size;
-    return position;
-}
-
-static void buffer_write_bytes(bson_buffer* buffer, const char* bytes, int size) {
-    buffer_assure_space(buffer, size);
-
-    memcpy(buffer->buffer + buffer->position, bytes, size);
-    buffer->position += size;
-}
-
-static VALUE pack_extra(bson_buffer* buffer, VALUE check_keys) {
+static VALUE pack_extra(buffer_t buffer, VALUE check_keys) {
     return rb_ary_new3(2, LL2NUM((long long)buffer), check_keys);
 }
 
-static void write_name_and_type(bson_buffer* buffer, VALUE name, char type) {
-    buffer_write_bytes(buffer, &type, 1);
-    buffer_write_bytes(buffer, RSTRING_PTR(name), RSTRING_LEN(name));
-    buffer_write_bytes(buffer, &zero, 1);
+static void write_name_and_type(buffer_t buffer, VALUE name, char type) {
+    SAFE_WRITE(buffer, &type, 1);
+    name = TO_UTF8(name);
+    write_utf8(buffer, name);
+    SAFE_WRITE(buffer, &zero, 1);
 }
 
 static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow_id) {
-    bson_buffer* buffer = (bson_buffer*)NUM2LL(rb_ary_entry(extra, 0));
+    buffer_t buffer = (buffer_t)NUM2LL(rb_ary_entry(extra, 0));
     VALUE check_keys = rb_ary_entry(extra, 1);
 
     if (TYPE(key) == T_SYMBOL) {
@@ -184,6 +149,7 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
     }
 
     if (TYPE(key) != T_STRING) {
+        buffer_free(buffer);
         rb_raise(rb_eTypeError, "keys must be strings or symbols");
     }
 
@@ -194,10 +160,12 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
     if (check_keys == Qtrue) {
         int i;
         if (RSTRING_LEN(key) > 0 && RSTRING_PTR(key)[0] == '$') {
+            buffer_free(buffer);
             rb_raise(InvalidName, "key must not start with '$'");
         }
         for (i = 0; i < RSTRING_LEN(key); i++) {
             if (RSTRING_PTR(key)[i] == '.') {
+                buffer_free(buffer);
                 rb_raise(InvalidName, "key must not contain '.'");
             }
         }
@@ -209,6 +177,7 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
         {
             if (rb_funcall(value, rb_intern(">"), 1, LL2NUM(9223372036854775807LL)) == Qtrue ||
                 rb_funcall(value, rb_intern("<"), 1, LL2NUM(-9223372036854775808LL)) == Qtrue) {
+                buffer_free(buffer);
                 rb_raise(rb_eRangeError, "MongoDB can only handle 8-byte ints");
             }
             if (rb_funcall(value, rb_intern(">"), 1, INT2NUM(2147483647L)) == Qtrue ||
@@ -216,32 +185,32 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
                 long long ll_value;
                 write_name_and_type(buffer, key, 0x12);
                 ll_value = NUM2LL(value);
-                buffer_write_bytes(buffer, (char*)&ll_value, 8);
+                SAFE_WRITE(buffer, (char*)&ll_value, 8);
             } else {
                 int int_value;
                 write_name_and_type(buffer, key, 0x10);
                 int_value = NUM2LL(value);
-                buffer_write_bytes(buffer, (char*)&int_value, 4);
+                SAFE_WRITE(buffer, (char*)&int_value, 4);
             }
             break;
         }
     case T_TRUE:
         {
             write_name_and_type(buffer, key, 0x08);
-            buffer_write_bytes(buffer, &one, 1);
+            SAFE_WRITE(buffer, &one, 1);
             break;
         }
     case T_FALSE:
         {
             write_name_and_type(buffer, key, 0x08);
-            buffer_write_bytes(buffer, &zero, 1);
+            SAFE_WRITE(buffer, &zero, 1);
             break;
         }
     case T_FLOAT:
         {
             double d = NUM2DBL(value);
             write_name_and_type(buffer, key, 0x01);
-            buffer_write_bytes(buffer, (char*)&d, 8);
+            SAFE_WRITE(buffer, (char*)&d, 8);
             break;
         }
     case T_NIL:
@@ -257,14 +226,18 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
         }
     case T_ARRAY:
         {
-            int start_position, length_location, items, i, obj_length;
+            buffer_position length_location, start_position, obj_length;
+            int items, i;
             VALUE* values;
 
             write_name_and_type(buffer, key, 0x04);
-            start_position = buffer->position;
+            start_position = buffer_get_position(buffer);
 
             // save space for length
-            length_location = buffer_save_bytes(buffer, 4);
+            length_location = buffer_save_space(buffer, 4);
+            if (length_location == -1) {
+                rb_raise(rb_eNoMemError, "failed to allocate memory in buffer.c");
+            }
 
             items = RARRAY_LEN(value);
             values = RARRAY_PTR(value);
@@ -278,37 +251,42 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
             }
 
             // write null byte and fill in length
-            buffer_write_bytes(buffer, &zero, 1);
-            obj_length = buffer->position - start_position;
-            memcpy(buffer->buffer + length_location, &obj_length, 4);
+            SAFE_WRITE(buffer, &zero, 1);
+            obj_length = buffer_get_position(buffer) - start_position;
+            SAFE_WRITE_AT_POS(buffer, length_location, (const char*)&obj_length, 4);
             break;
         }
     case T_STRING:
         {
             if (strcmp(rb_class2name(RBASIC(value)->klass),
                        "Mongo::Code") == 0) {
-                int start_position, length_location, length, total_length;
+                buffer_position length_location, start_position, total_length;
+                int length;
                 write_name_and_type(buffer, key, 0x0F);
 
-                start_position = buffer->position;
-                length_location = buffer_save_bytes(buffer, 4);
+                start_position = buffer_get_position(buffer);
+                length_location = buffer_save_space(buffer, 4);
+                if (length_location == -1) {
+                    rb_raise(rb_eNoMemError, "failed to allocate memory in buffer.c");
+                }
 
                 length = RSTRING_LEN(value) + 1;
-                buffer_write_bytes(buffer, (char*)&length, 4);
-                buffer_write_bytes(buffer, RSTRING_PTR(value), length - 1);
-                buffer_write_bytes(buffer, &zero, 1);
+                SAFE_WRITE(buffer, (char*)&length, 4);
+                SAFE_WRITE(buffer, RSTRING_PTR(value), length - 1);
+                SAFE_WRITE(buffer, &zero, 1);
                 write_doc(buffer, rb_funcall(value, rb_intern("scope"), 0), Qfalse);
 
-                total_length = buffer->position - start_position;
-                memcpy(buffer->buffer + length_location, &total_length, 4);
-
+                total_length = buffer_get_position(buffer) - start_position;
+                SAFE_WRITE_AT_POS(buffer, length_location, (const char*)&total_length, 4);
                 break;
             } else {
-                int length = RSTRING_LEN(value) + 1;
+                int length;
                 write_name_and_type(buffer, key, 0x02);
-                buffer_write_bytes(buffer, (char*)&length, 4);
-                buffer_write_bytes(buffer, RSTRING_PTR(value), length - 1);
-                buffer_write_bytes(buffer, &zero, 1);
+                value = TO_UTF8(value);
+                length = RSTRING_LEN(value) + 1;
+                SAFE_WRITE(buffer, (char*)&length, 4);
+                write_utf8(buffer, value);
+                SAFE_WRITE(buffer, &zero, 1);
                 break;
             }
         }
@@ -317,8 +295,8 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
             const char* str_value = rb_id2name(SYM2ID(value));
             int length = strlen(str_value) + 1;
             write_name_and_type(buffer, key, 0x0E);
-            buffer_write_bytes(buffer, (char*)&length, 4);
-            buffer_write_bytes(buffer, str_value, length);
+            SAFE_WRITE(buffer, (char*)&length, 4);
+            SAFE_WRITE(buffer, str_value, length);
             break;
         }
     case T_OBJECT:
@@ -334,14 +312,14 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
                 write_name_and_type(buffer, key, 0x05);
                 if (subtype == 2) {
                     const int other_length = length + 4;
-                    buffer_write_bytes(buffer, (const char*)&other_length, 4);
-                    buffer_write_bytes(buffer, &subtype, 1);
+                    SAFE_WRITE(buffer, (const char*)&other_length, 4);
+                    SAFE_WRITE(buffer, &subtype, 1);
                 }
-                buffer_write_bytes(buffer, (const char*)&length, 4);
+                SAFE_WRITE(buffer, (const char*)&length, 4);
                 if (subtype != 2) {
-                    buffer_write_bytes(buffer, &subtype, 1);
+                    SAFE_WRITE(buffer, &subtype, 1);
                 }
-                buffer_write_bytes(buffer, RSTRING_PTR(string_data), length);
+                SAFE_WRITE(buffer, RSTRING_PTR(string_data), length);
                 break;
             }
             if (strcmp(cls, "Mongo::ObjectID") == 0) {
@@ -350,19 +328,22 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
                 write_name_and_type(buffer, key, 0x07);
                 for (i = 0; i < 12; i++) {
                     char byte = (char)FIX2INT(RARRAY_PTR(as_array)[i]);
-                    buffer_write_bytes(buffer, &byte, 1);
+                    SAFE_WRITE(buffer, &byte, 1);
                 }
                 break;
             }
             if (strcmp(cls, "Mongo::DBRef") == 0) {
-                int start_position, length_location, obj_length;
+                buffer_position length_location, start_position, obj_length;
                 VALUE ns, oid;
                 write_name_and_type(buffer, key, 0x03);
 
-                start_position = buffer->position;
+                start_position = buffer_get_position(buffer);
 
                 // save space for length
-                length_location = buffer_save_bytes(buffer, 4);
+                length_location = buffer_save_space(buffer, 4);
+                if (length_location == -1) {
+                    rb_raise(rb_eNoMemError, "failed to allocate memory in buffer.c");
+                }
 
                 ns = rb_funcall(value, rb_intern("namespace"), 0);
                 write_element(rb_str_new2("$ref"), ns, pack_extra(buffer, Qfalse));
@@ -370,9 +351,9 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
                 write_element(rb_str_new2("$id"), oid, pack_extra(buffer, Qfalse));
 
                 // write null byte and fill in length
-                buffer_write_bytes(buffer, &zero, 1);
-                obj_length = buffer->position - start_position;
-                memcpy(buffer->buffer + length_location, &obj_length, 4);
+                SAFE_WRITE(buffer, &zero, 1);
+                obj_length = buffer_get_position(buffer) - start_position;
+                SAFE_WRITE_AT_POS(buffer, length_location, (const char*)&obj_length, 4);
                 break;
             }
         }
@@ -384,7 +365,7 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
                 double t = NUM2DBL(rb_funcall(value, rb_intern("to_f"), 0));
                 long long time_since_epoch = (long long)round(t * 1000);
                 write_name_and_type(buffer, key, 0x09);
-                buffer_write_bytes(buffer, (const char*)&time_since_epoch, 8);
+                SAFE_WRITE(buffer, (const char*)&time_since_epoch, 8);
                 break;
             }
         }
@@ -397,35 +378,36 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
 
             write_name_and_type(buffer, key, 0x0B);
 
-            buffer_write_bytes(buffer, pattern, length);
-            buffer_write_bytes(buffer, &zero, 1);
+            SAFE_WRITE(buffer, pattern, length);
+            SAFE_WRITE(buffer, &zero, 1);
 
             if (flags & IGNORECASE) {
                 char ignorecase = 'i';
-                buffer_write_bytes(buffer, &ignorecase, 1);
+                SAFE_WRITE(buffer, &ignorecase, 1);
             }
             if (flags & MULTILINE) {
                 char multiline = 'm';
-                buffer_write_bytes(buffer, &multiline, 1);
+                SAFE_WRITE(buffer, &multiline, 1);
             }
             if (flags & EXTENDED) {
                 char extended = 'x';
-                buffer_write_bytes(buffer, &extended, 1);
+                SAFE_WRITE(buffer, &extended, 1);
             }
 
             has_extra = rb_funcall(value, rb_intern("respond_to?"), 1, rb_str_new2("extra_options_str"));
             if (TYPE(has_extra) == T_TRUE) {
                 VALUE extra = rb_funcall(value, rb_intern("extra_options_str"), 0);
-                int old_position = buffer->position;
-                buffer_write_bytes(buffer, RSTRING_PTR(extra), RSTRING_LEN(extra));
-                qsort(buffer->buffer + old_position, RSTRING_LEN(extra), sizeof(char), cmp_char);
+                buffer_position old_position = buffer_get_position(buffer);
+                SAFE_WRITE(buffer, RSTRING_PTR(extra), RSTRING_LEN(extra));
+                qsort(buffer_get_buffer(buffer) + old_position, RSTRING_LEN(extra), sizeof(char), cmp_char);
             }
-            buffer_write_bytes(buffer, &zero, 1);
+            SAFE_WRITE(buffer, &zero, 1);
 
             break;
         }
     default:
         {
+            buffer_free(buffer);
             rb_raise(rb_eTypeError, "no c encoder for this type yet (%d)", TYPE(value));
             break;
         }
@@ -437,13 +419,17 @@ static int write_element(VALUE key, VALUE value, VALUE extra) {
     return write_element_allow_id(key, value, extra, 0);
 }
 
-static void write_doc(bson_buffer* buffer, VALUE hash, VALUE check_keys) {
-    int start_position = buffer->position;
-    int length_location = buffer_save_bytes(buffer, 4);
-    int length;
-
+static void write_doc(buffer_t buffer, VALUE hash, VALUE check_keys) {
+    buffer_position start_position = buffer_get_position(buffer);
+    buffer_position length_location = buffer_save_space(buffer, 4);
+    buffer_position length;
     VALUE id_str = rb_str_new2("_id");
     VALUE id_sym = ID2SYM(rb_intern("_id"));
+
+    if (length_location == -1) {
+        rb_raise(rb_eNoMemError, "failed to allocate memory in buffer.c");
+    }
+
     if (rb_funcall(hash, rb_intern("has_key?"), 1, id_str) == Qtrue) {
         VALUE id = rb_hash_aref(hash, id_str);
         write_element_allow_id(id_str, id, pack_extra(buffer, check_keys), 1);
@@ -467,20 +453,24 @@ static void write_doc(bson_buffer* buffer, VALUE hash, VALUE check_keys) {
     }
 
     // write null byte and fill in length
-    buffer_write_bytes(buffer, &zero, 1);
-    length = buffer->position - start_position;
-    memcpy(buffer->buffer + length_location, &length, 4);
+    SAFE_WRITE(buffer, &zero, 1);
+    length = buffer_get_position(buffer) - start_position;
+    SAFE_WRITE_AT_POS(buffer, length_location, &length, 4);
 }
 
 static VALUE method_serialize(VALUE self, VALUE doc, VALUE check_keys) {
     VALUE result;
-    bson_buffer* buffer = buffer_new();
-    assert(buffer);
+    buffer_t buffer = buffer_new();
+    if (buffer == NULL) {
+        rb_raise(rb_eNoMemError, "failed to allocate memory in buffer.c");
+    }
 
     write_doc(buffer, doc, check_keys);
 
-    result = rb_str_new(buffer->buffer, buffer->position);
-    buffer_free(buffer);
+    result = rb_str_new(buffer_get_buffer(buffer), buffer_get_position(buffer));
+    if (buffer_free(buffer) != 0) {
+        rb_raise(rb_eRuntimeError, "failed to free buffer");
+    }
     return result;
 }
 
@@ -589,7 +579,7 @@ static VALUE get_value(const char* buffer, int* position, int type) {
             long long millis;
             VALUE seconds, microseconds;
             memcpy(&millis, buffer + *position, 8);
-            seconds = INT2NUM(millis / 1000);
+            seconds = LL2NUM(millis / 1000);
             microseconds = INT2NUM((millis % 1000) * 1000);
 
             value = rb_funcall(Time, rb_intern("at"), 2, seconds, microseconds);
@@ -771,7 +761,7 @@ static VALUE objectid_generate(VALUE self)
     t = htonl(time(NULL));
     MEMCPY(&oid_bytes, &t, unsigned char, 4);
 
-    if (gethostname(&hostname, MAX_HOSTNAME_LENGTH) != 0) {
+    if (gethostname(hostname, MAX_HOSTNAME_LENGTH) != 0) {
         rb_raise(rb_eRuntimeError, "failed to get hostname");
     }
     digest = rb_funcall(DigestMD5, rb_intern("digest"), 1, rb_str_new2(hostname));
@@ -792,7 +782,7 @@ static VALUE objectid_generate(VALUE self)
 
 
 void Init_cbson() {
-    VALUE mongo, CBson, Digest;
+    VALUE mongo, CBson, Digest, ext_version;
     Time = rb_const_get(rb_cObject, rb_intern("Time"));
 
     mongo = rb_const_get(rb_cObject, rb_intern("Mongo"));
@@ -808,10 +798,13 @@ void Init_cbson() {
     RegexpOfHolding = rb_const_get(mongo, rb_intern("RegexpOfHolding"));
     rb_require("mongo/errors");
     InvalidName = rb_const_get(mongo, rb_intern("InvalidName"));
+    InvalidStringEncoding = rb_const_get(mongo, rb_intern("InvalidStringEncoding"));
     rb_require("mongo/util/ordered_hash");
     OrderedHash = rb_const_get(rb_cObject, rb_intern("OrderedHash"));
 
     CBson = rb_define_module("CBson");
+    ext_version = rb_str_new2(VERSION);
+    rb_define_const(CBson, "VERSION", ext_version);
     rb_define_module_function(CBson, "serialize", method_serialize, 2);
     rb_define_module_function(CBson, "deserialize", method_deserialize, 1);
 

data/ext/cbson/encoding_helpers.c

@@ -0,0 +1,107 @@
+/*
+ * Copyright 2009 10gen, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Copyright 2001 Unicode, Inc.
+ *
+ * Disclaimer
+ *
+ * This source code is provided as is by Unicode, Inc. No claims are
+ * made as to fitness for any particular purpose. No warranties of any
+ * kind are expressed or implied. The recipient agrees to determine
+ * applicability of information provided. If this file has been
+ * purchased on magnetic or optical media from Unicode, Inc., the
+ * sole remedy for any claim will be exchange of defective media
+ * within 90 days of receipt.
+ *
+ * Limitations on Rights to Redistribute This Code
+ *
+ * Unicode, Inc. hereby grants the right to freely use the information
+ * supplied in this file in the creation of products supporting the
+ * Unicode Standard, and to make copies of this file in any form
+ * for internal or external distribution as long as this notice
+ * remains attached.
+ */
+
+/*
+ * Index into the table below with the first byte of a UTF-8 sequence to
+ * get the number of trailing bytes that are supposed to follow it.
+ */
+static const char trailingBytesForUTF8[256] = {
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
+};
+
+/* --------------------------------------------------------------------- */
+
+/*
+ * Utility routine to tell whether a sequence of bytes is legal UTF-8.
+ * This must be called with the length pre-determined by the first byte.
+ * The length can be set by:
+ *  length = trailingBytesForUTF8[*source]+1;
+ * and the sequence is illegal right away if there aren't that many bytes
+ * available.
+ * If presented with a length > 4, this returns 0.  The Unicode
+ * definition of UTF-8 goes up to 4-byte sequences.
+ */
+static unsigned char isLegalUTF8(const unsigned char* source, int length) {
+    unsigned char a;
+    const unsigned char* srcptr = source + length;
+    switch (length) {
+    default: return 0;
+        /* Everything else falls through when "true"... */
+    case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return 0;
+    case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return 0;
+    case 2: if ((a = (*--srcptr)) > 0xBF) return 0;
+        switch (*source) {
+            /* no fall-through in this inner switch */
+            case 0xE0: if (a < 0xA0) return 0; break;
+            case 0xF0: if (a < 0x90) return 0; break;
+            case 0xF4: if (a > 0x8F) return 0; break;
+            default:  if (a < 0x80) return 0;
+        }
+        case 1: if (*source >= 0x80 && *source < 0xC2) return 0;
+        if (*source > 0xF4) return 0;
+    }
+    return 1;
+}
+
+/* --------------------------------------------------------------------- */
+
+/*
+ * Return whether a string containing UTF-8 is legal.
+ */
+unsigned char is_legal_utf8_string(const unsigned char* string, const int length) {
+    int position = 0;
+
+    while (position < length) {
+        int sequence_length = trailingBytesForUTF8[*(string + position)] + 1;
+        if ((position + sequence_length) > length) {
+            return 0;
+        }
+        if (!isLegalUTF8(string + position, sequence_length)) {
+            return 0;
+        }
+        position += sequence_length;
+    }
+    return 1;
+}

data/ext/cbson/encoding_helpers.h

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2009 10gen, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ENCODING_HELPERS_H
+#define ENCODING_HELPERS_H
+
+unsigned char is_legal_utf8_string(const unsigned char* string, const int length);
+
+#endif

data/ext/cbson/version.h

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2009 10gen, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define VERSION "0.18.1"

data/mongo-extensions.gemspec

@@ -1,16 +1,17 @@
 require 'lib/mongo'
-
+VERSION_HEADER = File.open(File.join(File.dirname(__FILE__), 'ext', 'cbson', 'version.h'), "r") 
+VERSION        = VERSION_HEADER.read.scan(/VERSION\s+"(\d+\.\d+(\.\d+)?)\"/)[0][0]
 Gem::Specification.new do |s|
   s.name = 'mongo_ext'
 
-  s.version = Mongo::VERSION
+  s.version  = VERSION
   s.platform = Gem::Platform::RUBY
-  s.summary = 'C extensions for the MongoDB Ruby driver'
+  s.summary  = 'C extensions for the MongoDB Ruby driver'
   s.description = 'C extensions to accelerate the MongoDB Ruby driver. For more information about Mongo, see http://www.mongodb.org.'
 
   s.require_paths = ['ext']
   s.files = ['Rakefile', 'mongo-extensions.gemspec']
-  s.files += Dir['ext/**/*.rb'] + Dir['ext/**/*.c']
+  s.files += Dir['ext/**/*.rb'] + Dir['ext/**/*.c'] + Dir['ext/**/*.h']
   s.test_files = []
 
   s.has_rdoc = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_ext
 version: !ruby/object:Gem::Version 
-  version: "0.18"
+  version: 0.18.1
 platform: ruby
 authors: 
 - Mike Dirolf
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-25 00:00:00 -05:00
+date: 2009-12-05 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -25,11 +25,14 @@ files:
 - Rakefile
 - mongo-extensions.gemspec
 - ext/cbson/extconf.rb
+- ext/cbson/buffer.c
 - ext/cbson/cbson.c
-has_rdoc: true
+- ext/cbson/encoding_helpers.c
+- ext/cbson/buffer.h
+- ext/cbson/encoding_helpers.h
+- ext/cbson/version.h
+has_rdoc: false
 homepage: http://www.mongodb.org
-licenses: []
-
 post_install_message: 
 rdoc_options: []
 
@@ -50,9 +53,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: C extensions for the MongoDB Ruby driver
 test_files: []