diff options
| author | djm <> | 2009-04-06 06:33:20 +0000 |
|---|---|---|
| committer | djm <> | 2009-04-06 06:33:20 +0000 |
| commit | 02266ad76553362863ec35a28c86ea7a4f5acdf9 (patch) | |
| tree | 647f179fa8dcccf50c436cc0165a1d67476a936e /src/lib/libcrypto/conf | |
| parent | d9de323e6e6b00c0f5eda2fd1399c8c51cdb19c4 (diff) | |
| download | openbsd-02266ad76553362863ec35a28c86ea7a4f5acdf9.tar.gz openbsd-02266ad76553362863ec35a28c86ea7a4f5acdf9.tar.bz2 openbsd-02266ad76553362863ec35a28c86ea7a4f5acdf9.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/conf')
| -rw-r--r-- | src/lib/libcrypto/conf/conf_mod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/conf/conf_mod.c b/src/lib/libcrypto/conf/conf_mod.c index e286378cb1..ee9c677d9b 100644 --- a/src/lib/libcrypto/conf/conf_mod.c +++ b/src/lib/libcrypto/conf/conf_mod.c | |||
| @@ -588,7 +588,7 @@ int CONF_parse_list(const char *list_, int sep, int nospc, | |||
| 588 | { | 588 | { |
| 589 | if (nospc) | 589 | if (nospc) |
| 590 | { | 590 | { |
| 591 | while(isspace((unsigned char)*lstart)) | 591 | while(*lstart && isspace((unsigned char)*lstart)) |
| 592 | lstart++; | 592 | lstart++; |
| 593 | } | 593 | } |
| 594 | p = strchr(lstart, sep); | 594 | p = strchr(lstart, sep); |
