resolve conflicts

1 files changed, 5 insertions, 0 deletions

diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c
index 2e9f52f1fd..b5a876ae68 100644
--- a/src/lib/libcrypto/conf/conf_def.c
+++ b/src/lib/libcrypto/conf/conf_def.c
@@ -632,6 +632,11 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
                         BUF_MEM_grow_clean(buf,(strlen(p)+len-(e-from)));
                         while (*p)
                                 buf->data[to++]= *(p++);
+
+                        /* Since we change the pointer 'from', we also have
+                           to change the perceived length of the string it
+                           points at.  /RL */
+                        len -= e-from;
                         from=e;
                         }
                 else