about summary refs log tree commit diff
path: root/Src/Modules
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2004-03-16 15:14:30 +0000
committerClint Adams <clint@users.sourceforge.net>2004-03-16 15:14:30 +0000
commitbefd90b84787b2508ee32549f7a38859d0056b55 (patch)
treef8dfcd86944cea0a9e8028a94622f85f658ac7ff /Src/Modules
parent8860363e5c989b0026e482a2cd9d04d4492816af (diff)
downloadzsh-befd90b84787b2508ee32549f7a38859d0056b55.tar.gz
zsh-befd90b84787b2508ee32549f7a38859d0056b55.tar.xz
zsh-befd90b84787b2508ee32549f7a38859d0056b55.zip
* 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.
Diffstat (limited to 'Src/Modules')
-rw-r--r--Src/Modules/pcre.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/Src/Modules/pcre.c b/Src/Modules/pcre.c
index 36c437bc3..030d1c78a 100644
--- a/Src/Modules/pcre.c
+++ b/Src/Modules/pcre.c
@@ -3,7 +3,7 @@
  *
  * 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.
  *
  * 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)
 {
     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);
     if (pcre_error != NULL)