2004-11-09  Jakub Jelinek  <jakub@redhat.com>

	* posix/regcomp.c (calc_eclosure_iter): Don't access
	dfa->edests[node].elems[0] if dfa->edests[node].nelem == 0.
	* posix/rxspencer/tests: Add 5 new tests.
This commit is contained in:
Ulrich Drepper 2004-11-10 00:50:40 +00:00
parent e00a230282
commit b4ae56bdc8
4 changed files with 16 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2004-11-09 Jakub Jelinek <jakub@redhat.com>
* posix/regcomp.c (calc_eclosure_iter): Don't access
dfa->edests[node].elems[0] if dfa->edests[node].nelem == 0.
* posix/rxspencer/tests: Add 5 new tests.
2004-11-09 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/ifaddrs.c: Determine sin6_scope_id field

View File

@ -1602,7 +1602,9 @@ calc_eclosure_iter (new_set, dfa, node, root)
? dfa->nodes[node].opr.ctx_type : 0);
/* If the current node has constraints, duplicate all nodes.
Since they must inherit the constraints. */
if (constraint && !dfa->nodes[dfa->edests[node].elems[0]].duplicated)
if (constraint
&& dfa->edests[node].nelem
&& !dfa->nodes[dfa->edests[node].elems[0]].duplicated)
{
int org_node, cur_node;
org_node = cur_node = node;

View File

@ -505,3 +505,8 @@ Char \([a-z0-9_]*\)\[.* b Char xyz[k Char xyz[k xyz
a?b - ab ab
-\{0,1\}[0-9]*$ b -5 -5
a*a*a*a*a*a*a* & aaaaaa aaaaaa
(\b){0} - x @x -
\(\b\)\{0,0\} b abc @abc -
a(\b){0}c - ac ac -
a(.*)b(\0){0}c - abc abc @bc,-
a(.*)b(\0){0}c - axbc axbc x,-

View File

@ -610,8 +610,8 @@ getifaddrs (struct ifaddrs **ifap)
{
memcpy (&ifas[ifa_index].addr.s6.sin6_addr,
rta_data, rta_payload);
if (IN6_IS_ADDR_LINKLOCAL (rta_data) ||
IN6_IS_ADDR_MC_LINKLOCAL (rta_data))
if (IN6_IS_ADDR_LINKLOCAL (rta_data)
|| IN6_IS_ADDR_MC_LINKLOCAL (rta_data))
ifas[ifa_index].addr.s6.sin6_scope_id =
ifam->ifa_index;
}