diff options
| author | Nuno Lopes <nlopess@php.net> | 2008-07-17 14:27:54 +0000 |
|---|---|---|
| committer | Nuno Lopes <nlopess@php.net> | 2008-07-17 14:27:54 +0000 |
| commit | b23f3cd8624c88c7129d97c66221c57b2ca0a1cf (patch) | |
| tree | b0f0e3885f87996329d1e7dcf1d1c3161b92daa1 /ext/pcre/pcrelib/pcre_info.c | |
| parent | bc9bdc928ecc6f189edd6f1a57a29d9a1e3341fc (diff) | |
| download | php-git-b23f3cd8624c88c7129d97c66221c57b2ca0a1cf.tar.gz | |
upgrade PCRE to 7.7 + one additional patch to fix a security bug
Diffstat (limited to 'ext/pcre/pcrelib/pcre_info.c')
| -rw-r--r-- | ext/pcre/pcrelib/pcre_info.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/pcre/pcrelib/pcre_info.c b/ext/pcre/pcrelib/pcre_info.c index b318b93eaa..f653d70bd3 100644 --- a/ext/pcre/pcrelib/pcre_info.c +++ b/ext/pcre/pcrelib/pcre_info.c @@ -6,7 +6,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel - Copyright (c) 1997-2006 University of Cambridge + Copyright (c) 1997-2008 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -43,6 +43,8 @@ information about a compiled pattern. However, use of this function is now deprecated, as it has been superseded by pcre_fullinfo(). */ +#include "config.h" + #include "pcre_internal.h" @@ -68,7 +70,7 @@ Returns: number of capturing subpatterns or negative values on error */ -PCRE_DATA_SCOPE int +PCRE_EXP_DEFN int pcre_info(const pcre *argument_re, int *optptr, int *first_byte) { real_pcre internal_re; @@ -81,8 +83,8 @@ if (re->magic_number != MAGIC_NUMBER) } if (optptr != NULL) *optptr = (int)(re->options & PUBLIC_OPTIONS); if (first_byte != NULL) - *first_byte = ((re->options & PCRE_FIRSTSET) != 0)? re->first_byte : - ((re->options & PCRE_STARTLINE) != 0)? -1 : -2; + *first_byte = ((re->flags & PCRE_FIRSTSET) != 0)? re->first_byte : + ((re->flags & PCRE_STARTLINE) != 0)? -1 : -2; return re->top_bracket; } |