[Ada] Fix computation of handle/pid lists in win32_wait

An obvious mistake due to missing parentheses was not properly computing the
size of the handle and pid list passed to WaitForMultipleObjects(). This
resulted in a memory corruption.

2018-05-23  Pascal Obry  <obry@adacore.com>

gcc/ada/

	* adaint.c (win32_wait): Add missing parentheses.

From-SVN: r260598

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e1f83b5e01324ad49975378a78a06d226d32c55c..c2df68d156276e6d315fe2e97906532910a8a607 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2018-05-23  Pascal Obry  <obry@adacore.com>
+
+       * adaint.c (win32_wait): Add missing parentheses.
+
 2018-05-23  Hristian Kirtchev  <kirtchev@adacore.com>
 
        * exp_ch3.adb (Check_Large_Modular_Array): Moved to Freeze.

diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index 9e0919e5dfa86ec50f8c58c3ee12237d9d509080..07e55e4eb857b8e9e41fec7cc202155c71a99730 100644 (file)
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
@@ -2591,10 +2591,10 @@ win32_wait (int *status)
 #else
   /* Note that index 0 contains the event handle that is signaled when the
      process list has changed */
-  hl = (HANDLE *) xmalloc (sizeof (HANDLE) * hl_len + 1);
+  hl = (HANDLE *) xmalloc (sizeof (HANDLE) * (hl_len + 1));
   hl[0] = ProcListEvt;
   memmove (&hl[1], HANDLES_LIST, sizeof (HANDLE) * hl_len);
-  pidl = (int *) xmalloc (sizeof (int) * hl_len + 1);
+  pidl = (int *) xmalloc (sizeof (int) * (hl_len + 1));
   memmove (&pidl[1], PID_LIST, sizeof (int) * hl_len);
   hl_len++;
 #endif