1 files changed, 8 insertions, 0 deletions

diff --git a/src/lib/libcrypto/ec/ec_lib.c b/src/lib/libcrypto/ec/ec_lib.c
index e0d78d67fb..0cf485de60 100644
--- a/src/lib/libcrypto/ec/ec_lib.c
+++ b/src/lib/libcrypto/ec/ec_lib.c
@@ -106,6 +106,8 @@ EC_GROUP *EC_GROUP_new(const EC_METHOD *meth)
 
 void EC_GROUP_free(EC_GROUP *group)
         {
+        if (!group) return;
+
         if (group->meth->group_finish != 0)
                 group->meth->group_finish(group);
 
@@ -117,6 +119,8 @@ void EC_GROUP_free(EC_GROUP *group)
 
 void EC_GROUP_clear_free(EC_GROUP *group)
         {
+        if (!group) return;
+
         if (group->meth->group_clear_finish != 0)
                 group->meth->group_clear_finish(group);
         else if (group->meth != NULL && group->meth->group_finish != 0)
@@ -337,6 +341,8 @@ EC_POINT *EC_POINT_new(const EC_GROUP *group)
 
 void EC_POINT_free(EC_POINT *point)
         {
+        if (!point) return;
+
         if (point->meth->point_finish != 0)
                 point->meth->point_finish(point);
         OPENSSL_free(point);
@@ -345,6 +351,8 @@ void EC_POINT_free(EC_POINT *point)
 
 void EC_POINT_clear_free(EC_POINT *point)
         {
+        if (!point) return;
+
         if (point->meth->point_clear_finish != 0)
                 point->meth->point_clear_finish(point);
         else if (point->meth != NULL && point->meth->point_finish != 0)