From: Haomai Wang <haomaiwang@gmail.com>
Date: Sun, 28 Dec 2014 13:31:35 +0000 (+0800)
Subject: Event: Avoid illegal multiplication for memset
X-Git-Tag: v0.92~89^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=793c32d5f1e7ae431d41006ac490d4303ed7f431;p=ceph.git

Event: Avoid illegal multiplication for memset

Because "file_events" is "FileEvent" type and adding an integral value to
this pointer automatically scales that value by the size.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
---

diff --git a/src/msg/async/Event.cc b/src/msg/async/Event.cc
index 2aea4ba0303f..94c2ed1baec8 100644
--- a/src/msg/async/Event.cc
+++ b/src/msg/async/Event.cc
@@ -120,7 +120,7 @@ int EventCenter::create_file_event(int fd, int mask, EventCallbackRef ctxt)
       lderr(cct) << __func__ << " failed to realloc file_events" << cpp_strerror(errno) << dendl;
       return -errno;
     }
-    memset(file_events+sizeof(FileEvent)*nevent, 0, sizeof(FileEvent)*(new_size-nevent));
+    memset(file_events+nevent, 0, sizeof(FileEvent)*(new_size-nevent));
     file_events = new_events;
     nevent = new_size;
   }