# HG changeset patch
# User jwilhelm
# Date 1504019877 -7200
# Node ID c4d5e997476657f052f9c764effbb6defe1cda4c
# Parent  2c55106dc37b42d49e6871db17d0f85b960557ed# Parent  1d2eb4f23b71f444f432efc52e5634ffe2518599
Merge

diff -r 2c55106dc37b -r c4d5e9974766 jdk/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c
--- a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c	Tue Aug 29 12:16:28 2017 -0700
+++ b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c	Tue Aug 29 17:17:57 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -57,7 +57,7 @@
     }
     (void)outStream_writeString(out, name);
     if (name != NULL) {
-        jvmtiDeallocate(name);
+        JNI_FUNC_PTR(env, ReleaseStringUTFChars)(env, namestr, name);
     }
     return JNI_TRUE;
 }