| commit | 3fafaa3a61b09f457087eded0a6b476152b51eaa | [log] [tgz] |
|---|---|---|
| author | kasperl@google.com <kasperl@google.com> | Fri Feb 21 09:53:01 2014 +0000 |
| committer | kasperl@google.com <kasperl@google.com> | Wed May 27 13:32:01 2015 -0700 |
| tree | 2ede608b903f7bdc744e76bbd3f183231fc431dc | |
| parent | 80499b32afcfe2d3ab17515ca8ad8eed30659d80 [diff] |
Version 1.2.0-dev.5.13 svn merge -c 32848 https://dart.googlecode.com/svn/branches/bleeding_edge trunk svn merge -c 32854 https://dart.googlecode.com/svn/branches/bleeding_edge trunk R=whesse@google.com Review URL: https://codereview.chromium.org//173803005 git-svn-id: http://dart.googlecode.com/svn/trunk@32882 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/runtime/bin/file_win.cc b/runtime/bin/file_win.cc index 32905f4..98d4bf7 100644 --- a/runtime/bin/file_win.cc +++ b/runtime/bin/file_win.cc
@@ -455,6 +455,7 @@ struct _stat64 st; const wchar_t* system_name = StringUtils::Utf8ToWide(name); int stat_status = _wstat64(system_name, &st); + free(const_cast<wchar_t*>(system_name)); if (stat_status == 0) { data[kCreatedTime] = st.st_ctime; data[kModifiedTime] = st.st_mtime;
diff --git a/sdk/bin/docgen.bat b/sdk/bin/docgen.bat index 220703a..136b7f9 100644 --- a/sdk/bin/docgen.bat +++ b/sdk/bin/docgen.bat
@@ -25,9 +25,9 @@ set BUILD_DIR=%SDK_DIR%\..\build\%DART_CONFIGURATION% if exist "%SNAPSHOT%" ( - "%DART%" "%SNAPSHOT%" "docgen" "--sdk=%SDK_DIR" %* + "%DART%" "%SNAPSHOT%" "docgen" "--sdk=%SDK_DIR%" %* ) else ( - "%BUILD_DIR%\dart-sdk\bin\dart" "--package-root=%BUILD_DIR%\packages" "%DOCGEN%" "--sdk=%SDK_DIR" %* + "%BUILD_DIR%\dart-sdk\bin\dart" "--package-root=%BUILD_DIR%\packages" "%DOCGEN%" "--sdk=%SDK_DIR%" %* ) endlocal
diff --git a/tools/VERSION b/tools/VERSION index e775b01..cfc2891 100644 --- a/tools/VERSION +++ b/tools/VERSION
@@ -28,4 +28,4 @@ MINOR 2 PATCH 0 PRERELEASE 5 -PRERELEASE_PATCH 12 +PRERELEASE_PATCH 13