--- old/src/java.base/share/native/libfdlibm/k_rem_pio2.c	2018-08-28 15:05:24.958435934 +0100
+++ new/src/java.base/share/native/libfdlibm/k_rem_pio2.c	2018-08-28 15:05:24.738435362 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -252,7 +252,7 @@
             j = 0;
             for (i=jz-1;i>=jk;i--) j |= iq[i];
             if(j==0) { /* need recomputation */
-                for(k=1;iq[jk-k]==0;k++);   /* k = no. of terms needed */
+                for(k=1;k<=jk&&iq[jk-k]==0;k++);   /* k = no. of terms needed */
 
                 for(i=jz+1;i<=jz+k;i++) {   /* add q[jz+1] to q[jz+k] */
                     f[jx+i] = (double) ipio2[jv+i];