diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-10-18 15:09:11 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-10-18 15:09:11 +0000 |
| commit | ddda572b1c44d4f621bd73ade0d283a281e2aed9 (patch) | |
| tree | 176b569a345b91cd7c16efbae85c69845b5543c5 /src | |
| parent | Renamed "Outline thin strokes" to "visible hairlines" to make the intent clea... (diff) | |
| parent | Nulling pointer after destroying its data. (diff) | |
| download | inkscape-ddda572b1c44d4f621bd73ade0d283a281e2aed9.tar.gz inkscape-ddda572b1c44d4f621bd73ade0d283a281e2aed9.zip | |
Merge branch 'master' of gitlab.com:xhorak/inkscape
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/libcroco/cr-om-parser.c | 3 | ||||
| -rw-r--r-- | src/io/uristream.cpp | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/3rdparty/libcroco/cr-om-parser.c b/src/3rdparty/libcroco/cr-om-parser.c index 596cd6e6b..7e1127e41 100644 --- a/src/3rdparty/libcroco/cr-om-parser.c +++ b/src/3rdparty/libcroco/cr-om-parser.c @@ -691,6 +691,7 @@ property (CRDocHandler * a_this, (ctxt->cur_stmt->kind.ruleset->decl_list, decl); if (!decl2) { cr_declaration_destroy (decl); + decl = NULL; cr_utils_trace_info ("Could not append decl to ruleset"); goto error; @@ -706,6 +707,7 @@ property (CRDocHandler * a_this, decl); if (!decl2) { cr_declaration_destroy (decl); + decl = NULL; cr_utils_trace_info ("Could not append decl to ruleset"); goto error; @@ -719,6 +721,7 @@ property (CRDocHandler * a_this, (ctxt->cur_stmt->kind.page_rule->decl_list, decl); if (!decl2) { cr_declaration_destroy (decl); + decl = NULL; cr_utils_trace_info ("Could not append decl to ruleset"); goto error; diff --git a/src/io/uristream.cpp b/src/io/uristream.cpp index ff4cca74d..9fd0d9c96 100644 --- a/src/io/uristream.cpp +++ b/src/io/uristream.cpp @@ -321,11 +321,14 @@ UriOutputStream::UriOutputStream(Inkscape::URI &destination) //printf("out path:'%s'\n", cpath); outf = fopen_utf8name(cpath, FILE_WRITE); //outf = fopen(cpath, "wb"); - g_free(cpath); + if (!outf) { Glib::ustring err = "UriOutputStream cannot open file "; err += cpath; + g_free(cpath); throw StreamException(err); + } else { + g_free(cpath); } break; |