* The following bugs are resolved with this release:
6652, 10672, 12847, 12926, 13862, 14132, 14138, 14171, 14498, 15215,
- 15884, 16469, 16619, 16740, 16857, 17192, 17266, 17344, 17363, 17370,
- 17371, 17411, 17460, 17475, 17485, 17501, 17506, 17508, 17522, 17555,
- 17570, 17571, 17572, 17573, 17574, 17581, 17582, 17583, 17584, 17585,
- 17589, 17594, 17601, 17608, 17616, 17625, 17633, 17634, 17647, 17653,
- 17664, 17665, 17668, 17682.
+ 15884, 16469, 16619, 16657, 16740, 16857, 17192, 17266, 17344, 17363,
+ 17370, 17371, 17411, 17460, 17475, 17485, 17501, 17506, 17508, 17522,
+ 17555, 17570, 17571, 17572, 17573, 17574, 17581, 17582, 17583, 17584,
+ 17585, 17589, 17594, 17601, 17608, 17616, 17625, 17633, 17634, 17647,
+ 17653, 17664, 17665, 17668, 17682.
* CVE-2104-7817 The wordexp function could ignore the WRDE_NOCMD flag
under certain input conditions resulting in the execution of a shell for
#define lll_trylock_elision(a,t) lll_trylock(a)
#endif
-#ifndef DO_ELISION
-#define DO_ELISION(m) 0
+#ifndef FORCE_ELISION
+#define FORCE_ELISION(m, s)
#endif
/* We don't force elision in trylock, because this can lead to inconsistent
break;
case PTHREAD_MUTEX_TIMED_ELISION_NP:
- elision:
+ elision: __attribute__((unused))
if (lll_trylock_elision (mutex->__data.__lock,
mutex->__data.__elision) != 0)
break;
return 0;
case PTHREAD_MUTEX_TIMED_NP:
- if (DO_ELISION (mutex))
- goto elision;
+ FORCE_ELISION (mutex, goto elision);
/*FALL THROUGH*/
case PTHREAD_MUTEX_ADAPTIVE_NP:
case PTHREAD_MUTEX_ERRORCHECK_NP: