Merge 9b4666a into 798ad5d

curl · Jul 18, 2017 · 9178e02 · 9178e02
2 parents 798ad5d + 9b4666a
commit 9178e02
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/lib/multi.c b/lib/multi.c
@@ -1022,6 +1022,8 @@ CURLMcode curl_multi_wait(struct Curl_multi *multi,
 
   if(nfds) {
     if(nfds > NUM_POLLS_ON_STACK) {
+	  if (nfds > SIZE_MAX / sizeof(struct pollfd))
+		return CURLM_INTERNAL_ERROR;
       ufds = malloc(nfds * sizeof(struct pollfd));
       if(!ufds)
         return CURLM_OUT_OF_MEMORY;