From bc0c04961b7cc98e573dac6c0eb8e92c9e0918ef Mon Sep 17 00:00:00 2001 From: Cristy Date: Sat, 25 Aug 2018 10:55:07 -0400 Subject: [PATCH] Move IsCoderAuthorized() from header --- MagickCore/coder-private.h | 18 ------------------ MagickCore/constitute.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/MagickCore/coder-private.h b/MagickCore/coder-private.h index 694b12a62..cc9b0aca2 100644 --- a/MagickCore/coder-private.h +++ b/MagickCore/coder-private.h @@ -22,30 +22,12 @@ extern "C" { #endif -#include -#include "MagickCore/exception-private.h" -#include "MagickCore/policy.h" - extern MagickPrivate MagickBooleanType CoderComponentGenesis(void); extern MagickPrivate void CoderComponentTerminus(void); -static inline MagickBooleanType IsCoderAuthorized(const char *module, - const char *coder,const PolicyRights rights,ExceptionInfo *exception) -{ - if ((IsRightsAuthorized(ModulePolicyDomain,rights,module) == MagickFalse) || - (IsRightsAuthorized(CoderPolicyDomain,rights,coder) == MagickFalse)) - { - errno=EPERM; - (void) ThrowMagickException(exception,GetMagickModule(),PolicyError, - "NotAuthorized","`%s:%s'",module,coder); - return(MagickFalse); - } - return(MagickTrue); -} - #if defined(__cplusplus) || defined(c_plusplus) } #endif diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c index b1161578a..620b33bca 100644 --- a/MagickCore/constitute.c +++ b/MagickCore/constitute.c @@ -398,6 +398,21 @@ MagickExport Image *PingImages(ImageInfo *image_info,const char *filename, % o exception: return any errors or warnings in this structure. % */ + +static MagickBooleanType IsCoderAuthorized(const char *module,const char *coder, + const PolicyRights rights,ExceptionInfo *exception) +{ + if ((IsRightsAuthorized(ModulePolicyDomain,rights,module) == MagickFalse) || + (IsRightsAuthorized(CoderPolicyDomain,rights,coder) == MagickFalse)) + { + errno=EPERM; + (void) ThrowMagickException(exception,GetMagickModule(),PolicyError, + "NotAuthorized","`%s:%s'",module,coder); + return(MagickFalse); + } + return(MagickTrue); +} + MagickExport Image *ReadImage(const ImageInfo *image_info, ExceptionInfo *exception) { -- 2.40.0