summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/c/urweb.c5
-rw-r--r--src/compiler.sml2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/c/urweb.c b/src/c/urweb.c
index ef159333..472f6eb4 100644
--- a/src/c/urweb.c
+++ b/src/c/urweb.c
@@ -2851,7 +2851,8 @@ int uw_rollback(uw_context ctx) {
ctx->transactionals[i].rollback(ctx->transactionals[i].data);
for (i = 0; i < ctx->used_transactionals; ++i)
- ctx->transactionals[i].free(ctx->transactionals[i].data);
+ if (ctx->transactionals[i].free)
+ ctx->transactionals[i].free(ctx->transactionals[i].data);
return uw_db_rollback(ctx);
}
@@ -2859,7 +2860,7 @@ int uw_rollback(uw_context ctx) {
void uw_register_transactional(uw_context ctx, void *data, uw_callback commit, uw_callback rollback,
uw_callback free) {
if (ctx->used_transactionals >= ctx->n_transactionals) {
- ctx->transactionals = realloc(ctx->transactionals, ctx->used_transactionals+1);
+ ctx->transactionals = realloc(ctx->transactionals, sizeof(transactional) * (ctx->used_transactionals+1));
++ctx->n_transactionals;
}
diff --git a/src/compiler.sml b/src/compiler.sml
index 88046256..fc764205 100644
--- a/src/compiler.sml
+++ b/src/compiler.sml
@@ -561,7 +561,7 @@ fun parseUrp' accLibs fname =
| "library" => if accLibs then
libs := pu (relify arg) :: !libs
else
- bigLibs := relify arg :: !bigLibs
+ bigLibs := arg :: !bigLibs
| "path" =>
(case String.fields (fn ch => ch = #"=") arg of
[n, v] => pathmap := M.insert (!pathmap, n, v)