summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/base/ftinit.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ebd2438ce..e9132ff8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-06-07 Philip Race <philip.race@oracle.com>
+
+ * src/base/ftinit.c (FT_Set_Default_Properties): Fix crash.
+
+ Terminate loop at end of environment.
+
2019-05-31 Alexei Podtelezhnikov <apodtele@gmail.com>
Solidify VC2005 builds.
diff --git a/src/base/ftinit.c b/src/base/ftinit.c
index 9d524effa..c73cd78b8 100644
--- a/src/base/ftinit.c
+++ b/src/base/ftinit.c
@@ -176,6 +176,9 @@
module_name,
property_name,
property_value );
+
+ if ( !*p )
+ break;
}
}