Fixed buffer overflow in check_ntp/check_ntp_peer (#1999319, Ubuntu #291265)

[nagiosplug.git] / plugins / check_ntp.c

diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index 68c82d1154655907b4b7e8df8221d8b1de1e2594..489ad60aafb5016108bc8a986f432e8c8668d5ed 100644 (file)
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -198,7 +198,7 @@ typedef struct {
 /* NTP control message header is 12 bytes, plus any data in the data
  * field, plus null padding to the nearest 32-bit boundary per rfc.
  */
-#define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((m.count)?4-(ntohs(m.count)%4):0))
+#define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((ntohs(m.count)%4)?4-(ntohs(m.count)%4):0))
 
 /* finally, a little helper or two for debugging: */
 #define DBG(x) do{if(verbose>1){ x; }}while(0);