diff --git a/ChangeLog b/ChangeLog
index b510b1702..f59fed05b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,8 @@ Bugfix
    * Fix out-of-memory problem when parsing 4096-bit PKCS8-encrypted RSA keys.
      Found independently by Florian in the mbed TLS forum and by Mishamax.
      #878, #1019.
+   * Fix variable used before assignment compilation warnings with IAR
+     toolchain. Found by gkerrien38.
 
 = mbed TLS 2.6.0 branch released 2017-08-10
 
diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 544c8cf5c..922743360 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -2261,7 +2261,7 @@ static int ssl_parse_server_key_exchange( mbedtls_ssl_context *ssl )
     int ret;
     const mbedtls_ssl_ciphersuite_t *ciphersuite_info =
         ssl->transform_negotiate->ciphersuite_info;
-    unsigned char *p, *end;
+    unsigned char *p = NULL, *end = NULL;
 
     MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> parse server key exchange" ) );