Merge pull request #549 from mxaddict/fix-__poll_chk-glib-compat-issue

mxaddict · web-flow · commit ee832697b981 · 2019-07-03T18:02:55.000+08:00
Updated __poll_chk implementation to be not so strict
diff --git a/src/compat/glibc_compat.cpp b/src/compat/glibc_compat.cpp
@@ -6,7 +6,6 @@
 #include <config/navcoin-config.h>
 #endif
 
-#include <assert.h>
 #include <cstddef>
 #include <cstdint>
 #include <errno.h>
@@ -110,7 +109,8 @@ extern "C" int __wrap_glob64(const char * pattern, int flags, int (*errfunc) (co
 
 extern "C" int __poll_chk(struct pollfd *fds, nfds_t nfds, int timeout, size_t fdslen)
 {
-    assert((fdslen / sizeof(*fds)) < nfds);
+    if(fdslen / sizeof(*fds) < nfds)
+        __chk_fail();
     return poll(fds, nfds, timeout);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`#include <config/navcoin-config.h>`
`7`	`7`	`#endif`
`8`	`8`
`9`		`-#include <assert.h>`
`10`	`9`	`#include <cstddef>`
`11`	`10`	`#include <cstdint>`
`12`	`11`	`#include <errno.h>`
`@@ -110,7 +109,8 @@ extern "C" int __wrap_glob64(const char * pattern, int flags, int (*errfunc) (co`
`110`	`109`
`111`	`110`	`extern "C" int __poll_chk(struct pollfd *fds, nfds_t nfds, int timeout, size_t fdslen)`
`112`	`111`	`{`
`113`		`- assert((fdslen / sizeof(*fds)) < nfds);`
	`112`	`+ if(fdslen / sizeof(*fds) < nfds)`
	`113`	`+ __chk_fail();`
`114`	`114`	`return poll(fds, nfds, timeout);`
`115`	`115`	`}`
`116`	`116`