iodine 0.7.22 → 0.7.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8932b4e432bde801ae72ddb5a757e178a3fa2ca061527521c2b941d964be8920
-  data.tar.gz: a6d6c4056060ad82e0b735aa6ebf067cbde0f5a6bda6d9a16fea1c62ba7b14df
+  metadata.gz: 6f79c66c0601bd9b530d826440476bb2c670c641b0d249ecef01b68d50cf3bee
+  data.tar.gz: 63e8eda390f1e86a2d585e8173c1681dee333b68a5efb09cda2b00e81ecda75f
 SHA512:
-  metadata.gz: e3d3bef35a9ca6707ab14105ec5a6c6bab88cb23666be74892f6d56c3ae829a21d3bd03fee40096d891b6db147f1c1935b3c379c4e93192d15f18094e2da1760
-  data.tar.gz: f50bd45abd3d7cecb8156912168ee265936c1a39e51d378c70ceffeab4d0c884cf8959611a1fcbeb03146b1460ec874b7164d57b636dedae5b1f505fe49b88b1
+  metadata.gz: e00867e6c5cf0efa7925af1cd9ee5d16869df7563b7cc9ce2c52551db679689fbfaf7b2991561ce0098bc959dacdd2e1499f26657a7d01be5e4bf056256deb38
+  data.tar.gz: 18c9c99f0b8d5a191f691e0945aea15244e23f49d69a182bed501655dc263e3d2c8162f994049e9ac66e3e1c8373b53540a28b68c5aebe0d4a0d0ac88383a2c2

data/CHANGELOG.md

@@ -6,6 +6,12 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ## Changes:
 
+#### Change log v.0.7.23
+
+**Fix**: (`fio`): fixed logging message for overflowing log messages. Credit to @weskerfoot (Wesley Kerfoot) and @adam12 (Adam Daniels) for exposing the issue (issue #56).
+
+**Updates**: (`fio`) facil.io updates.
+
 #### Change log v.0.7.22
 
 **Fix**: (`fio`, `redis`) fixed IPC messages between redis connections (in the master process) and callback blocks (executed in the worker processes). Credit to @moxgeek (Marouane Elmidaoui) for exposing this issue (plezi#31).

data/ext/iodine/fio.c

@@ -9142,14 +9142,14 @@ FIO_FUNC inline void fio_str_test(void) {
     str = FIO_STR_INIT_STATIC("Welcome");
     fio_str_info_s state = fio_str_write(&str, " Home", 5);
     FIO_ASSERT(state.capa > 0, "Static string not converted to non-static.");
-    FIO_ASSERT(str.dealloc, "MIssing static string deallocation function"
+    FIO_ASSERT(str.dealloc, "Missing static string deallocation function"
                             " after `fio_str_write`.");
 
-    fprintf(stderr, "* reviewing `fio_str_detach`.\n");
+    fprintf(stderr, "* reviewing `fio_str_detach`.\n   (%zu): %s\n", fio_str_info(&str).len, fio_str_info(&str).data);
     char *cstr = fio_str_detach(&str);
     FIO_ASSERT(cstr, "`fio_str_detach` returned NULL");
     FIO_ASSERT(!memcmp(cstr, "Welcome Home\0", 13),
-               "`fio_str_detach` string error");
+               "`fio_str_detach` string error: %s", cstr);
     fio_free(cstr);
     FIO_ASSERT(fio_str_len(&str) == 0, "`fio_str_detach` data wasn't cleared.");
     // fio_str_free(&str);

data/ext/iodine/fio.h

@@ -416,6 +416,13 @@ Logging and testing helpers
 /** Log everything, including debug messages. */
 #define FIO_LOG_LEVEL_DEBUG 5
 
+#if FIO_LOG_LENGTH_LIMIT > 128
+#define FIO_LOG_LENGTH_ON_STACK FIO_LOG_LENGTH_LIMIT
+#define FIO_LOG_LENGTH_BORDER (FIO_LOG_LENGTH_LIMIT - 32)
+#else
+#define FIO_LOG_LENGTH_ON_STACK (FIO_LOG_LENGTH_LIMIT + 32)
+#define FIO_LOG_LENGTH_BORDER FIO_LOG_LENGTH_LIMIT
+#endif
 /** The logging level */
 int __attribute__((weak)) FIO_LOG_LEVEL;
 
@@ -423,16 +430,14 @@ int __attribute__((weak)) FIO_LOG_LEVEL;
 #define FIO_LOG_PRINT(level, ...)                                              \
   do {                                                                         \
     if (level <= FIO_LOG_LEVEL) {                                              \
-      char tmp___log[FIO_LOG_LENGTH_LIMIT];                                    \
+      char tmp___log[FIO_LOG_LENGTH_ON_STACK];                                 \
       int len___log =                                                          \
           snprintf(tmp___log, FIO_LOG_LENGTH_LIMIT - 2, __VA_ARGS__);          \
       if (len___log <= 0 || len___log >= FIO_LOG_LENGTH_LIMIT - 2) {           \
-        if (len___log >= (FIO_LOG_LENGTH_LIMIT >> 2) &&                        \
-            (FIO_LOG_LENGTH_LIMIT >> 2) + 52 < FIO_LOG_LENGTH_LIMIT) {         \
-          fwrite(tmp___log, (FIO_LOG_LENGTH_LIMIT >> 2), 1, stderr);           \
-          memcpy(tmp___log + (FIO_LOG_LENGTH_LIMIT >> 2),                      \
-                 "...\nERROR: log line output too long (can't write).\n", 52); \
-          len___log = (FIO_LOG_LENGTH_LIMIT >> 2) + 52;                        \
+        if (len___log >= FIO_LOG_LENGTH_LIMIT - 2) {                           \
+          memcpy(tmp___log + FIO_LOG_LENGTH_BORDER,                            \
+                 "... (warning: truncated).", 25);                             \
+          len___log = FIO_LOG_LENGTH_BORDER + 25;                              \
         } else {                                                               \
           fwrite("ERROR: log output error (can't write).\n", 39, 1, stderr);   \
           break;                                                               \
@@ -3871,27 +3876,32 @@ inline FIO_FUNC size_t fio_str_capa(fio_str_s *s) {
  * Returns the updated state of the String.
  *
  * Note: When shrinking, any existing data beyond the new size may be corrupted.
+ *
+ * Note: When providing a new size that is grater then the current string
+ * capacity, any data that was written beyond the current (previous) size might
+ * be replaced with NUL bytes.
  */
 inline FIO_FUNC fio_str_info_s fio_str_resize(fio_str_s *s, size_t size) {
   if (!s || s->frozen) {
     return fio_str_info(s);
   }
   if (s->small || !s->data) {
-    if (size >= FIO_STR_SMALL_CAPA) {
-      s->small = (uint8_t)(((FIO_STR_SMALL_CAPA << 1) | 1) & 0xFF);
-      fio_str_capa_assert(s, size);
-      goto big;
+    if (size < FIO_STR_SMALL_CAPA) {
+      s->small = (uint8_t)(((size << 1) | 1) & 0xFF);
+      FIO_STR_SMALL_DATA(s)[size] = 0;
+      return (fio_str_info_s){.capa = (FIO_STR_SMALL_CAPA - 1),
+                              .len = size,
+                              .data = FIO_STR_SMALL_DATA(s)};
     }
-    s->small = (uint8_t)(((size << 1) | 1) & 0xFF);
-    FIO_STR_SMALL_DATA(s)[size] = 0;
-    return (fio_str_info_s){.capa = (FIO_STR_SMALL_CAPA - 1),
-                            .len = size,
-                            .data = FIO_STR_SMALL_DATA(s)};
+    s->small = (uint8_t)((((FIO_STR_SMALL_CAPA - 1) << 1) | 1) & 0xFF);
+    fio_str_capa_assert(s, size);
+    goto big;
   }
   if (size >= s->capa) {
-    s->len = s->capa;
+    s->len = fio_ct_if2((uintptr_t)s->dealloc, s->capa, s->len);
     fio_str_capa_assert(s, size);
   }
+
 big:
   s->len = size;
   s->data[size] = 0;

data/ext/iodine/fiobj_json.c

@@ -246,7 +246,8 @@ static void write_safe_str(FIOBJ dest, const FIOBJ str) {
     len--;
     if (added >= 48 && capa <= end + len + 64) {
       writer[end] = 0;
-      fiobj_str_resize(dest, (end + len + 64));
+      fiobj_str_resize(dest, end);
+      fiobj_str_capa_assert(dest, (end + len + 64));
       t = fiobj_obj2cstr(dest);
       writer = (char *)t.data;
       capa = t.capa;

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.7.22'.freeze
+  VERSION = '0.7.23'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.7.22
+  version: 0.7.23
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,7 +220,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 'Thank you for installing Iodine 0.7.22.
+post_install_message: 'Thank you for installing Iodine 0.7.23.
 
 '
 rdoc_options: []