diff options
| author | Dave Beckett <dave@dajobe.org> | 2010-08-06 22:28:44 -0700 |
|---|---|---|
| committer | Dave Beckett <dave@dajobe.org> | 2010-08-06 22:28:44 -0700 |
| commit | 75aa6dd30634adcebbfe6fd0ea64d8b40cc21519 (patch) | |
| tree | 550d1f5042c05d7453d096f5cf7a39d26100b93d /src/raptor_grddl.c | |
| parent | 2e3265c8df7967254b9e701cf4ee68d960b77ad8 (diff) | |
| download | raptor-75aa6dd30634adcebbfe6fd0ea64d8b40cc21519.tar.gz | |
Simplify libxslt save/restore logic
(raptor_libxslt_set_global_state): Always save default security prefs.
(raptor_libxslt_reset_global_state): Always restore default security
prefs.
Diffstat (limited to 'src/raptor_grddl.c')
| -rw-r--r-- | src/raptor_grddl.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/raptor_grddl.c b/src/raptor_grddl.c index 05e8575c..4d4f3e30 100644 --- a/src/raptor_grddl.c +++ b/src/raptor_grddl.c @@ -2081,11 +2081,11 @@ raptor_libxslt_set_global_state(raptor_parser *rdf_parser) xsltSetGenericErrorFunc(rdf_parser, raptor_grddl_xsltGenericError_handler); + /* save global (libxslt-wide) default security prefs */ + grddl_parser->saved_xsltSecurityPrefs = xsltGetDefaultSecurityPrefs(); + if(grddl_parser->world->xslt_security_preferences && !grddl_parser->world->xslt_security_preferences_policy) { - /* save global (libxslt-wide) default security prefs */ - grddl_parser->saved_xsltSecurityPrefs = xsltGetDefaultSecurityPrefs(); - /* set global (libxslt-wide) security preferences to raptor */ xsltSetDefaultSecurityPrefs(grddl_parser->world->xslt_security_preferences); } @@ -2103,11 +2103,8 @@ raptor_libxslt_reset_global_state(raptor_parser* rdf_parser) raptor_grddl_parser_context* grddl_parser; grddl_parser = (raptor_grddl_parser_context*)rdf_parser->context; - if(grddl_parser->saved_xsltSecurityPrefs && - !grddl_parser->world->xslt_security_preferences_policy) { - /* restore global (libxslt-wide) default security prefs */ - xsltSetDefaultSecurityPrefs(grddl_parser->saved_xsltSecurityPrefs); - } + /* restore global (libxslt-wide) default security prefs */ + xsltSetDefaultSecurityPrefs(grddl_parser->saved_xsltSecurityPrefs); /* restore global (libxslt-wide) generic error handler */ xsltSetGenericErrorFunc(grddl_parser->saved_xsltGenericErrorContext, |