java-native-access
diff --git a/‎CHANGES.md‎
Lines changed: 1 addition & 1 deletion b/‎CHANGES.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/com/sun/jna/Structure.java‎
Lines changed: 1 addition & 1 deletion b/‎src/com/sun/jna/Structure.java‎
Lines changed: 1 addition & 1 deletion
@@ -10,7 +10,7 @@ Features
 
 Bug Fixes
 ---------
-
+* [#1686](https://github.com/java-native-access/jna/issues/1686): Fix `sortFields` race condition while getting fields
 
 Release 5.18.0
 ==============
 
@@ -1125,7 +1125,7 @@ private static <T extends Comparable<T>> List<T> sort(Collection<? extends T> c)
         and can't be generated automatically.
     **/
     protected List<Field> getFields(boolean force) {
-        List<Field> flist = getFieldList();
+        List<Field> flist = new ArrayList<>(getFieldList());
         Set<String> names = new HashSet<>();
         for (Field f : flist) {
             names.add(f.getName());