mmdb 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c003d1a3bcc65bfd788940aee81b4e4e5d68bf9b
-  data.tar.gz: 1d0b0c279059882fae061b885b68386a8bcb910f
+  metadata.gz: 5c277732d781d5af075093218d48ca835861c071
+  data.tar.gz: 9bcdfc506dbaef0e3266f41fb3dcac470cbce7f6
 SHA512:
-  metadata.gz: 88c2e1f0674ec8978be22616318dc6ed024b66f22fc973ab00913c31d20ccbf0aa2953535d98fbb589df3504a2d23fc6e6259ea0089d9a940f2d0e514511a8c7
-  data.tar.gz: 8492961a442761eb29507316adbb6926bf5efe85ac70a505bb2e3a1feeef6f3cd2e1b760852f0dc03fcf5bc04ef30423712c6d7ee860aecb22517cd202f13dcd
+  metadata.gz: 6d29a077fb62a5a3fe7c88fb7de3c93c8f06bce27c0ae9ae717e5a270a8b0b6f3b8c6b02fdb2381f03eca94f485c3703b828eacad8e0f41e5b5864c83f6d2287
+  data.tar.gz: 3efa13c0ae818c60b62234649fdf852226eaf8fa1ffeee3803ff7907d35079e91f2dae8703b35b0319da274200e616441797659a7b5162a9ec906a1f3b2ea3f5

data/ext/mmdb/extconf.rb

@@ -1,5 +1,8 @@
 require 'mkmf'
 
 if have_header("maxminddb.h") && have_library("maxminddb")
+  if enable_config("debug")
+    CONFIG["debugflags"] << " -g3 -O0"
+  end
   create_makefile("mmdb")
 end

data/ext/mmdb/mmdb.c

@@ -70,15 +70,6 @@ static const rb_data_type_t mmdb_data_type = {
     RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
-// Supported 2.1 later
-#if RUBY_API_VERSION_CODE <= 20100
-VALUE
-rb_utf8_str_new(const char *ptr, long len) {
-    VALUE str = rb_str_new(ptr, len);
-    rb_enc_associate_index(str, rb_utf8_encindex());
-    return str;
-}
-#endif
 #define check_maxminddb(self) ((struct MaxMindDB*)rb_check_typeddata((self), &mmdb_data_type))
 #define number_of_digits(n, count) do { \
     n /= 10; \
@@ -103,6 +94,16 @@ maxminddb_alloc(VALUE klass) {
     return TypedData_Wrap_Struct(klass, &mmdb_data_type, 0);
 }
 
+// Supported 2.1 later
+#if (defined RUBY_API_VERSION_CODE) && (RUBY_API_VERSION_CODE <= 20100)
+static VALUE
+rb_utf8_str_new(const char *ptr, long len) {
+    VALUE str = rb_str_new(ptr, len);
+    rb_enc_associate_index(str, rb_utf8_encindex());
+    return str;
+}
+#endif
+
 static void
 maxminddb_set_result(VALUE hash, VALUE key, MMDB_entry_data_s *data) {
     if (data->has_data) {
@@ -164,10 +165,10 @@ maxminddb_lookup(VALUE self, VALUE ip) {
 
     lookuped = MMDB_lookup_string(ptr->mmdb, StringValuePtr(ip), &gai_error, &mmdb_error);
     if (gai_error) {
-        rb_raise(rb_eTypeError, gai_strerror(gai_error));
+        rb_raise(rb_eTypeError, "%s", gai_strerror(gai_error));
     }
     if (mmdb_error) {
-        rb_raise(rb_eTypeError, MMDB_strerror(mmdb_error));
+        rb_raise(rb_eTypeError, "%s", MMDB_strerror(mmdb_error));
     }
 
     if (lookuped.found_entry) {
@@ -200,14 +201,17 @@ maxminddb_lookup(VALUE self, VALUE ip) {
             // subdivisions fields is basically array
             if (data.type == MMDB_DATA_TYPE_ARRAY) {
                 VALUE ary = rb_ary_new();
-                int i;
-                int n, data_size;
-                int count = 0;
-                n = data_size = data.data_size;
-                number_of_digits(n, count);
-                char index[count+1];
-
-                for (i = 0; i < data_size; i++) {
+                unsigned int i, n;
+                unsigned int cnt = 0;
+                char *index;
+
+                // need to specify index as char*
+                n = data.data_size;
+                number_of_digits(n, cnt);
+                index = (char *)malloc(sizeof(char)*cnt+1);
+                memset(index, 0, sizeof(char)*cnt+1);
+
+                for (i = 0; i < data.data_size; i++) {
                     sprintf(index, "%d", i);
                     MMDB_get_value(entry, &data, subdivisions, index, names, en, NULL);
                     if (data.has_data) {
@@ -217,6 +221,8 @@ maxminddb_lookup(VALUE self, VALUE ip) {
                     }
                 }
 
+                free(index);
+
                 rb_hash_aset(ret, rb_sym_subdivisions, ary);
             }
         } else {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mmdb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - yoppi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-09 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler