Fix errors with ubsan

tatsuhiro-t · Jan 14, 2021 · 1c97e7a · 1c97e7a
1 parent 2fa72ec
commit 1c97e7a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/wslay_event.c b/lib/wslay_event.c
@@ -813,8 +813,12 @@ int wslay_event_send(wslay_event_context_ptr ctx) {
       iocb.opcode = ctx->omsg->opcode;
       iocb.rsv = ctx->omsg->rsv;
       iocb.mask = ctx->server ^ 1;
-      iocb.data = ctx->omsg->data + ctx->opayloadoff;
-      iocb.data_length = ctx->opayloadlen - ctx->opayloadoff;
+      iocb.data = ctx->omsg->data;
+      iocb.data_length = ctx->opayloadlen;
+      if (ctx->opayloadoff) {
+        iocb.data += ctx->opayloadoff;
+        iocb.data_length -= ctx->opayloadoff;
+      }
       iocb.payload_length = ctx->opayloadlen;
       r = wslay_frame_send(ctx->frame_ctx, &iocb);
       if (r >= 0) {

diff --git a/tests/wslay_frame_test.c b/tests/wslay_frame_test.c
@@ -50,7 +50,9 @@ struct scripted_data_feed {
 static void scripted_data_feed_init(struct scripted_data_feed *df,
                                     uint8_t *data, size_t data_length) {
   memset(df, 0, sizeof(struct scripted_data_feed));
-  memcpy(df->data, data, data_length);
+  if (data_length) {
+    memcpy(df->data, data, data_length);
+  }
   df->datamark = df->data;
   df->datalimit = df->data + data_length;
   df->feedseq[0] = data_length;