- don't free user-supplied string (via -e)

[oweals/busybox.git] / libbb / xregcomp.c

diff --git a/libbb/xregcomp.c b/libbb/xregcomp.c
index 4bcb9aedf548301086dda4c90492a5e6aaca16cf..abfa35ff1cf992ab3671ff654036bafa19852374 100644 (file)
--- a/libbb/xregcomp.c
+++ b/libbb/xregcomp.c
@@ -8,19 +8,25 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
 #include "libbb.h"
 #include "xregex.h"
 
-
-
-void xregcomp(regex_t *preg, const char *regex, int cflags)
+char* FAST_FUNC regcomp_or_errmsg(regex_t *preg, const char *regex, int cflags)
 {
-       int ret;
-       if ((ret = regcomp(preg, regex, cflags)) != 0) {
+       int ret = regcomp(preg, regex, cflags);
+       if (ret) {
                int errmsgsz = regerror(ret, preg, NULL, 0);
                char *errmsg = xmalloc(errmsgsz);
                regerror(ret, preg, errmsg, errmsgsz);
+               return errmsg;
+       }
+       return NULL;
+}
+
+void FAST_FUNC xregcomp(regex_t *preg, const char *regex, int cflags)
+{
+       char *errmsg = regcomp_or_errmsg(preg, regex, cflags);
+       if (errmsg) {
                bb_error_msg_and_die("xregcomp: %s", errmsg);
        }
 }