set encodedPoint to NULL after freeing it

[openssl.git] / fips / fips_canister.c

diff --git a/fips/fips_canister.c b/fips/fips_canister.c
index d71b5d5a3d860ec08a981b27f896d884a8e753ae..08d07e4b0084dc2448fe497caeb662152545f25f 100644 (file)
--- a/fips/fips_canister.c
+++ b/fips/fips_canister.c
@@ -27,10 +27,10 @@ const void         *FIPS_text_end(void);
 # endif
 #endif
 
-#if !defined(FIPS_REF_POINT_IS_SAFE_TO_CROSS_COMPILE)
+#if !defined(FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE)
 # if   (defined(__ANDROID__) && (defined(__arm__) || defined(__arm)))  || \
        (defined(__vxworks)   && (defined(__ppc__) || defined(__ppc)))
-#  define FIPS_REF_POINT_IS_SAFE_TO_CROSS_COMPILE
+#  define FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE
 # endif
 #endif
 
@@ -95,7 +95,7 @@ static void *instruction_pointer(void)
                        "move   %0,$31\n\t"
                        "move   $31,%1"         /* restore ra */
                        : "=r"(ret),"=r"(scratch) );
-# elif defined(__ppc__) || defined(__ppc) || \\
+# elif defined(__ppc__) || defined(__ppc) || \
        defined(__powerpc) || defined(__powerpc__) || \
        defined(__POWERPC__) || defined(_POWER) || defined(__PPC__) || \
        defined(__PPC64__) || defined(__ppc64__) || defined(__powerpc64__)
@@ -149,9 +149,9 @@ static void *instruction_pointer(void)
  */
 const void *FIPS_ref_point()
 {
-#if    defined(FIPS_REF_POINT_IS_SAFE_TO_CROSS_COMPILE)
+#if    defined(FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE)
     return (void *)FIPS_ref_point;
-#if    defined(INSTRUCTION_POINTER_IMPLEMENTED)
+#elif  defined(INSTRUCTION_POINTER_IMPLEMENTED)
     return instruction_pointer();
 /* Below we essentially cover vendor compilers which do not support
  * inline assembler... */