HV_FREE

base/hbase.h

@@ -24,8 +24,11 @@ HV_EXPORT void  safe_free(void* ptr);
 
 #define HV_FREE(ptr)\
     do {\
-        safe_free(ptr);\
-        printd("free( %p )\tat [%s:%d:%s]\n", ptr, __FILE__, __LINE__, __FUNCTION__);\
+        if (ptr) {\
+            safe_free(ptr);\
+            printd("free( %p )\tat [%s:%d:%s]\n", ptr, __FILE__, __LINE__, __FUNCTION__);\
+            ptr = NULL;\
+        }\
     } while(0)
 
 HV_EXPORT long hv_alloc_cnt();

event/nio.c

@@ -192,7 +192,7 @@ read:
         }
         else {
             io->error = socket_errno();
-            /* perror("read"); */
+            // perror("read");
             goto read_error;
         }
     }
@@ -253,7 +253,7 @@ write:
         }
         else {
             io->error = socket_errno();
-            /* perror("write"); */
+            // perror("write");
             goto write_error;
         }
     }
@@ -384,7 +384,7 @@ try_write:
                 goto enqueue;
             }
             else {
-                /* perror("write"); */
+                // perror("write");
                 io->error = socket_errno();
                 goto write_error;
             }
@@ -401,9 +401,9 @@ try_write:
             //goto write_done;
             return nwrite;
         }
+enqueue:
         hio_add(io, hio_handle_events, HV_WRITE);
     }
-enqueue:
     if (nwrite < len) {
         offset_buf_t rest;
         rest.len = len;