agoo 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87f91bf3855678dbd8f99aed64322c1dfffe5ba513770ec31ac43aefbf3d8773
-  data.tar.gz: 9d7aebbd6902ad5806157cca7003768a7addc650aa416680482b4e1337f36389
+  metadata.gz: da2816b985fc556221634cd9002ddf9a2fd2a33c5e0ddc09c897ef8d9c686afc
+  data.tar.gz: c99f5e5679c4b837dfd3ff2bbed6425905c1d41295666c82e5d0779811a2a202
 SHA512:
-  metadata.gz: '08abf0bcb6125fecc0efc5c93e62cb9d72c85146f57b63060a44667bfe7476fd3b0374ee8e40f0faafaa4fff20b65b53499e830fa5e352cb8fd85fd2c56cb5dd'
-  data.tar.gz: b20a23b0cd620b06a14d7d934f69e9d471a8c16d8ad3e7b3ebda073c8889cae7a825d42e831335a5ba1bfc2e868b255134b1d0fe6d1b582d9b14c89ab0778a15
+  metadata.gz: 5eacde94a5ec77f4901fafc4bc6e2424729b4edbfbe40c9151f16fbb84ef354f7400ad463fd8b7c91120c40b65e7a86f734aafbd3657a7138b71a259a35eccd1
+  data.tar.gz: 0c649ea6946255f17903b623dc8fd3767e0a712355bc4556d2a2a511017e8abfefaf4f3acff7fddd57fe3714559ff6ecdd5134fcbe104bde900a688d97c8322d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+### 2.0.4 - 2018-05-06
+
+- Fix allocation bug.
+
 ### 2.0.3 - 2018-05-05
 
 - Allow X-XSS-Protection and only check headers in pendantic mode.

data/ext/agoo/ccache.c

@@ -64,7 +64,7 @@ cc_set_con(CCache cc, Con con) {
 
     pthread_mutex_lock(&cc->lock);
     for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (con->id = slot->cid) {
+	if (con->id == slot->cid) {
 	    slot->con = con;
 	    break;
 	}
@@ -97,7 +97,7 @@ cc_set_handler(CCache cc, uint64_t cid, VALUE handler, bool on_empty, bool on_cl
 
     pthread_mutex_lock(&cc->lock);
     for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid = slot->cid) {
+	if (cid == slot->cid) {
 	    slot->handler = handler;
 	    break;
 	}
@@ -134,7 +134,7 @@ cc_remove(CCache cc, uint64_t cid) {
 
     pthread_mutex_lock(&cc->lock);
     for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid = slot->cid) {
+	if (cid == slot->cid) {
 	    if (NULL == prev) {
 		*bucket = slot->next;
 	    } else {
@@ -159,7 +159,7 @@ cc_remove_con(CCache cc, uint64_t cid) {
 
     pthread_mutex_lock(&cc->lock);
     for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid = slot->cid) {
+	if (cid == slot->cid) {
 	    if (atomic_fetch_sub(&slot->ref_cnt, 1) <= 1) {
 		if (NULL == prev) {
 		    *bucket = slot->next;
@@ -190,7 +190,7 @@ cc_ref_dec(CCache cc, uint64_t cid) {
 
     pthread_mutex_lock(&cc->lock);
     for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid = slot->cid) {
+	if (cid == slot->cid) {
 	    int	rcnt = atomic_fetch_sub(&slot->ref_cnt, 1);
 
 	    handler = slot->handler;
@@ -223,7 +223,7 @@ cc_get_con(CCache cc, uint64_t cid) {
 
     pthread_mutex_lock(&cc->lock);
     for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid = slot->cid) {
+	if (cid == slot->cid) {
 	    con = slot->con;
 	    break;
 	}
@@ -241,7 +241,7 @@ cc_get_handler(CCache cc, uint64_t cid) {
 
     pthread_mutex_lock(&cc->lock);
     for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid = slot->cid) {
+	if (cid == slot->cid) {
 	    handler = slot->handler;
 	    break;
 	}
@@ -259,7 +259,7 @@ cc_get_pending(CCache cc, uint64_t cid) {
 
     pthread_mutex_lock(&cc->lock);
     for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid = slot->cid) {
+	if (cid == slot->cid) {
 	    pending = atomic_load(&slot->pending);
 	    break;
 	}
@@ -276,7 +276,7 @@ cc_get_slot(CCache cc, uint64_t cid) {
 
     pthread_mutex_lock(&cc->lock);
     for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid = slot->cid) {
+	if (cid == slot->cid) {
 	    break;
 	}
     }
@@ -292,7 +292,7 @@ cc_pending_inc(CCache cc, uint64_t cid) {
 
     pthread_mutex_lock(&cc->lock);
     for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid = slot->cid) {
+	if (cid == slot->cid) {
 	    atomic_fetch_add(&slot->pending, 1);
 	    break;
 	}

data/ext/agoo/debug.c

@@ -155,6 +155,23 @@ debug_add(void *ptr, const char *type, const char *file, int line) {
     pthread_mutex_unlock(&lock);	
 }
 
+void
+debug_update(void *orig, void *ptr, const char *type, const char *file, int line) {
+    Rec	r;
+    
+    pthread_mutex_lock(&lock);
+    for (r = recs; NULL != r; r = r->next) {
+	if (orig == r->ptr) {
+	    r->ptr = ptr;
+	    break;
+	}
+    }
+    pthread_mutex_unlock(&lock);	
+    if (NULL == r) {
+	printf("Realloc at %s:%d (%p) not allocated.\n", file, line, orig);
+    }
+}
+
 void
 debug_del(void *ptr, const char *file, int line) {
     Rec	r = NULL;

data/ext/agoo/debug.h

@@ -7,9 +7,11 @@
 
 #ifdef MEM_DEBUG
 #define DEBUG_ALLOC(var, ptr) { atomic_fetch_add(&var, 1); debug_add(ptr, #var, __FILE__, __LINE__); }
+#define DEBUG_REALLOC(var, orig, ptr) { debug_update(orig, ptr, #var, __FILE__, __LINE__); }
 #define DEBUG_FREE(var, ptr) { atomic_fetch_sub(&var, 1); debug_del(ptr, __FILE__, __LINE__); }
 #else
 #define DEBUG_ALLOC(var, ptr) { }
+#define DEBUG_REALLOC(var, orig, ptr) { }
 #define DEBUG_FREE(var, ptr) { }
 #endif
 
@@ -41,6 +43,7 @@ extern atomic_int	mem_text;
 extern atomic_int	mem_to_s;
 
 extern void	debug_add(void *ptr, const char *type, const char *file, int line);
+extern void	debug_update(void *orig, void *ptr, const char *type, const char *file, int line);
 extern void	debug_del(void *ptr, const char *file, int line);
 extern void	debug_report();
 extern void	debug_rreport(); // when called from ruby

data/ext/agoo/text.c

@@ -46,7 +46,7 @@ text_ref(Text t) {
 void
 text_release(Text t) {
     if (1 >= atomic_fetch_sub(&t->ref_cnt, 1)) {
-	DEBUG_FREE(mem_text, t)
+	DEBUG_FREE(mem_text, t);
 	free(t);
     }
 }
@@ -57,12 +57,14 @@ text_append(Text t, const char *s, int len) {
 	len = (int)strlen(s);
     }
     if (t->alen <= t->len + len) {
-	long	new_len = t->alen + t->alen / 2;
+	long	new_len = t->alen + len + t->alen / 2;
 	size_t	size = sizeof(struct _Text) - TEXT_MIN_SIZE + new_len + 1;
-
+	Text	t0 = t;
+	
 	if (NULL == (t = (Text)realloc(t, size))) {
 	    return NULL;
 	}
+	DEBUG_REALLOC(mem_text, t0, t);
 	t->alen = new_len;
     }
     memcpy(t->text + t->len, s, len);
@@ -78,7 +80,7 @@ text_prepend(Text t, const char *s, int len) {
 	len = (int)strlen(s);
     }
     if (t->alen <= t->len + len) {
-	long	new_len = t->alen + t->alen / 2;
+	long	new_len = t->alen + len + t->alen / 2;
 	size_t	size = sizeof(struct _Text) - TEXT_MIN_SIZE + new_len + 1;
 
 	if (NULL == (t = (Text)realloc(t, size))) {

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-05 00:00:00.000000000 Z
+date: 2018-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -137,12 +137,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Linux or macOS
 rubyforge_project: agoo
-rubygems_version: 2.7.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: An HTTP server
 test_files:
-- test/rack_handler_test.rb
 - test/base_handler_test.rb
-- test/static_test.rb
 - test/log_test.rb
+- test/rack_handler_test.rb
+- test/static_test.rb