fix segfault in uci batch

[project/uci.git] / libuci.c

diff --git a/libuci.c b/libuci.c
index 5872ae4220a8fff2810a68aa7e83b9a97a329396..bc68462fad19036288ba609a01fb20f580cc6810 100644 (file)
--- a/libuci.c
+++ b/libuci.c
@@ -85,8 +85,8 @@ void uci_free_context(struct uci_context *ctx)
        uci_foreach_element_safe(&ctx->history_path, tmp, e) {
                uci_free_element(e);
        }
-       free(ctx);
        UCI_TRAP_RESTORE(ctx);
+       free(ctx);
 
 ignore:
        return;
@@ -130,9 +130,24 @@ static void uci_cleanup(struct uci_context *ctx)
        free(pctx);
 }
 
-void uci_perror(struct uci_context *ctx, const char *prefix)
+void
+uci_perror(struct uci_context *ctx, const char *str)
+{
+       uci_get_errorstr(ctx, NULL, str);
+}
+
+void
+uci_get_errorstr(struct uci_context *ctx, char **dest, const char *prefix)
 {
+       static char error_info[128];
        int err;
+       const char *format =
+               "%s%s" /* prefix */
+               "%s%s" /* function */
+               "%s" /* error */
+               "%s"; /* details */
+
+       error_info[0] = 0;
 
        if (!ctx)
                err = UCI_ERR_INVAL;
@@ -142,22 +157,30 @@ void uci_perror(struct uci_context *ctx, const char *prefix)
        if ((err < 0) || (err >= UCI_ERR_LAST))
                err = UCI_ERR_UNKNOWN;
 
-       if (prefix)
-               fprintf(stderr, "%s: ", prefix);
-       if (ctx->func)
-               fprintf(stderr, "%s: ", ctx->func);
-
        switch (err) {
        case UCI_ERR_PARSE:
                if (ctx->pctx) {
-                       fprintf(stderr, "%s (%s) at line %d, byte %d\n", uci_errstr[err], (ctx->pctx->reason ? ctx->pctx->reason : "unknown"), ctx->pctx->line, ctx->pctx->byte);
+                       snprintf(error_info, sizeof(error_info) - 1, " (%s) at line %d, byte %d", (ctx->pctx->reason ? ctx->pctx->reason : "unknown"), ctx->pctx->line, ctx->pctx->byte);
                        break;
                }
-               /* fall through */
+               break;
        default:
-               fprintf(stderr, "%s\n", uci_errstr[err]);
                break;
        }
+       if (dest)
+               asprintf(dest, format,
+                       (prefix ? prefix : ""), (prefix ? ": " : ""),
+                       (ctx->func ? ctx->func : ""), (ctx->func ? ": " : ""),
+                       uci_errstr[err],
+                       error_info);
+       else {
+               strcat(error_info, "\n");
+               fprintf(stderr, format,
+                       (prefix ? prefix : ""), (prefix ? ": " : ""),
+                       (ctx->func ? ctx->func : ""), (ctx->func ? ": " : ""),
+                       uci_errstr[err],
+                       error_info);
+       }
 }
 
 int uci_list_configs(struct uci_context *ctx, char ***list)