From 9bafe73e6740256c7233414e16e001000131384c Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Fri, 20 Apr 2007 13:54:26 +0000 Subject: [PATCH 1/1] A little bit more safe version of HvMROMETA p4raw-id: //depot/perl@30994 --- hv.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hv.h b/hv.h index 7fb9fc4..a5ea429 100644 --- a/hv.h +++ b/hv.h @@ -266,7 +266,9 @@ C. #define HvRITER_get(hv) (SvOOK(hv) ? HvAUX(hv)->xhv_riter : -1) #define HvEITER_get(hv) (SvOOK(hv) ? HvAUX(hv)->xhv_eiter : 0) #define HvNAME(hv) HvNAME_get(hv) -#define HvMROMETA(hv) (HvAUX(hv)->xhv_mro_meta ? HvAUX(hv)->xhv_mro_meta : mro_meta_init(hv)) +#define HvMROMETA(hv) (SvOOK(hv) \ + ? (HvAUX(hv)->xhv_mro_meta ? HvAUX(hv)->xhv_mro_meta : mro_meta_init(hv)) \ + : NULL) /* FIXME - all of these should use a UTF8 aware API, which should also involve getting the length. */ /* This macro may go away without notice. */ -- 1.8.3.1