mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-11-19 13:33:52 +01:00
Code

* 19631: Doc/Zsh/mod_pcre.yo, Src/Modules/pcre.c: avoid segfault

Browse Source 
when pcre_study is called before pcre_compile; documentation on
      pcre_compile options.
This commit is contained in:
Clint Adams 2004-03-16 15:14:30 +00:00
parent 8860363e5c
commit befd90b847
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-03-16 Clint Adams <clint@zsh.org>
* 19631: Doc/Zsh/mod_pcre.yo, Src/Modules/pcre.c: avoid segfault
when pcre_study is called before pcre_compile; documentation on
pcre_compile options.
2004-03-16 Peter Stephenson <pws@csr.com> 2004-03-16 Peter Stephenson <pws@csr.com>
* 19140 (patch reversed): Nicholas George: Src/builtin.c: Release * 19140 (patch reversed): Nicholas George: Src/builtin.c: Release

7
Doc/Zsh/mod_pcre.yo
View File

@ -8,6 +8,13 @@ startitem()
findex(pcre_compile) findex(pcre_compile)
item(tt(pcre_compile) [ tt(-aimx) ] var(PCRE))( item(tt(pcre_compile) [ tt(-aimx) ] var(PCRE))(
Compiles a perl-compatible regular expression. Compiles a perl-compatible regular expression.
Option tt(-a) will force the pattern to be anchored.
Option tt(-i) will compile a case-insensitive pattern.
Option tt(-m) will compile a multi-line pattern; that is,
tt(^) and tt($) will match newlines within the pattern.
Option tt(-x) will compile an extended pattern, wherein
whitespace and tt(#) comments are ignored.
) )
findex(pcre_study) findex(pcre_study)
item(tt(pcre_study))( item(tt(pcre_study))(

9
Src/Modules/pcre.c
View File

@ -3,7 +3,7 @@
* *
* This file is part of zsh, the Z shell. * This file is part of zsh, the Z shell.
* *
* Copyright (c) 2001 Clint Adams * Copyright (c) 2001, 2002, 2003, 2004 Clint Adams
* All rights reserved. * All rights reserved.
* *
* Permission is hereby granted, without written agreement and without * Permission is hereby granted, without written agreement and without
@ -71,6 +71,13 @@ static int
bin_pcre_study(char *nam, char **args, Options ops, int func) bin_pcre_study(char *nam, char **args, Options ops, int func)
{ {
const char *pcre_error; const char *pcre_error;
if (pcre_pattern == NULL)
{
zwarnnam(nam, "no pattern has been compiled for study: %s",
pcre_error, 0);
return 1;
}
pcre_hints = pcre_study(pcre_pattern, 0, &pcre_error); pcre_hints = pcre_study(pcre_pattern, 0, &pcre_error);
if (pcre_error != NULL) if (pcre_error != NULL)