Skip to content

Commit

Permalink
Fixed a error #31 “Unhandled exceptions”
Browse files Browse the repository at this point in the history
  • Loading branch information
@Taritsyn
Taritsyn committed Oct 28, 2019
1 parent cd0f6ea commit 7d5cf08
Show file tree
Hide file tree
Showing 23 changed files with 49 additions and 48 deletions.
Binary file modified lib/linux-x64/libsass.so
View file
Binary file not shown.
Binary file modified lib/osx-x64/libsass.dylib
View file
Binary file not shown.
Binary file modified lib/win-x64/libsass.dll
View file
Binary file not shown.
Binary file modified lib/win-x86/libsass.dll
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions samples/LibSassHost.Sample.Net4.ConsoleApp/LibSassHost.Sample.Net4.ConsoleApp.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\LibSassHost.Native.win-x86.1.2.7\build\LibSassHost.Native.win-x86.props" Condition="Exists('..\..\packages\LibSassHost.Native.win-x86.1.2.7\build\LibSassHost.Native.win-x86.props')" />
<Import Project="..\..\packages\LibSassHost.Native.win-x64.1.2.7\build\LibSassHost.Native.win-x64.props" Condition="Exists('..\..\packages\LibSassHost.Native.win-x64.1.2.7\build\LibSassHost.Native.win-x64.props')" />
<Import Project="..\..\packages\LibSassHost.Native.win-x86.1.2.8\build\LibSassHost.Native.win-x86.props" Condition="Exists('..\..\packages\LibSassHost.Native.win-x86.1.2.8\build\LibSassHost.Native.win-x86.props')" />
<Import Project="..\..\packages\LibSassHost.Native.win-x64.1.2.8\build\LibSassHost.Native.win-x64.props" Condition="Exists('..\..\packages\LibSassHost.Native.win-x64.1.2.8\build\LibSassHost.Native.win-x64.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -59,7 +59,7 @@
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\LibSassHost.Native.win-x64.1.2.7\build\LibSassHost.Native.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibSassHost.Native.win-x64.1.2.7\build\LibSassHost.Native.win-x64.props'))" />
<Error Condition="!Exists('..\..\packages\LibSassHost.Native.win-x86.1.2.7\build\LibSassHost.Native.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibSassHost.Native.win-x86.1.2.7\build\LibSassHost.Native.win-x86.props'))" />
<Error Condition="!Exists('..\..\packages\LibSassHost.Native.win-x64.1.2.8\build\LibSassHost.Native.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibSassHost.Native.win-x64.1.2.8\build\LibSassHost.Native.win-x64.props'))" />
<Error Condition="!Exists('..\..\packages\LibSassHost.Native.win-x86.1.2.8\build\LibSassHost.Native.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibSassHost.Native.win-x86.1.2.8\build\LibSassHost.Native.win-x86.props'))" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions samples/LibSassHost.Sample.Net4.ConsoleApp/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="LibSassHost.Native.win-x64" version="1.2.7" targetFramework="net40-client" />
<package id="LibSassHost.Native.win-x86" version="1.2.7" targetFramework="net40-client" />
<package id="LibSassHost.Native.win-x64" version="1.2.8" targetFramework="net40-client" />
<package id="LibSassHost.Native.win-x86" version="1.2.8" targetFramework="net40-client" />
</packages>
8 changes: 4 additions & 4 deletions samples/LibSassHost.Sample.NetCore1.ConsoleApp/LibSassHost.Sample.NetCore1.ConsoleApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

<ItemGroup>
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.0.1" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.8" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.8" />
<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.2.8" />
<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.2.8" />

<ProjectReference Include="..\LibSassHost.Sample.Logic\LibSassHost.Sample.Logic.csproj" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...SassHost.Sample.NetCore1Full.ConsoleApp/LibSassHost.Sample.NetCore1Full.ConsoleApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<Import Project="../../build/common.props" />

<ItemGroup>
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.8" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.8" />

<ProjectReference Include="..\LibSassHost.Sample.Logic\LibSassHost.Sample.Logic.csproj" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions ...es/LibSassHost.Sample.NetCore21.ConsoleApp/LibSassHost.Sample.NetCore21.ConsoleApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

<ItemGroup>
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.8" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.8" />
<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.2.8" />
<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.2.8" />

<ProjectReference Include="..\LibSassHost.Sample.Logic\LibSassHost.Sample.Logic.csproj" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions samples/LibSassHost.Sample.NetCore3.ConsoleApp/LibSassHost.Sample.NetCore3.ConsoleApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

<ItemGroup>
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.8" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.8" />
<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.2.8" />
<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.2.8" />

<ProjectReference Include="..\LibSassHost.Sample.Logic\LibSassHost.Sample.Logic.csproj" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/LibSassHost.Native.linux-x64/LibSassHost.Native.linux-x64.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>LibSassHost.Native.linux-x64</id>
<version>1.2.7</version>
<version>1.2.8</version>
<title>LibSass Host Native for Linux (x64)</title>
<authors>Andrey Taritsyn</authors>
<owners>Andrey Taritsyn</owners>
Expand All @@ -14,7 +14,7 @@
<description>This package complements the LibSassHost package and contains the native implementation of LibSass version 3.6.2 for Linux (x64).

This package is only compatible with .NET Core.</description>
<releaseNotes>Added support of the LibSass version 3.6.2.</releaseNotes>
<releaseNotes>Fixed a error #31 “Unhandled exceptions”.</releaseNotes>
<copyright>Copyright © 2015-2019 Andrey Taritsyn</copyright>
<language>en-US</language>
<tags>LibSass Sass SCSS CSS Linux x64</tags>
Expand Down
4 changes: 2 additions & 2 deletions src/LibSassHost.Native.linux-x64/readme.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


--------------------------------------------------------------------------------
README file for LibSass Host Native for Linux x64 v1.2.7
README file for LibSass Host Native for Linux x64 v1.2.8

--------------------------------------------------------------------------------

Expand All @@ -19,7 +19,7 @@
=============
RELEASE NOTES
=============
Added support of the LibSass version 3.6.2.
Fixed a error #31 “Unhandled exceptions”.

============
PROJECT SITE
Expand Down
4 changes: 2 additions & 2 deletions src/LibSassHost.Native.osx-x64/LibSassHost.Native.osx-x64.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>LibSassHost.Native.osx-x64</id>
<version>1.2.7</version>
<version>1.2.8</version>
<title>LibSass Host Native for OS X (x64)</title>
<authors>Andrey Taritsyn</authors>
<owners>Andrey Taritsyn</owners>
Expand All @@ -14,7 +14,7 @@
<description>This package complements the LibSassHost package and contains the native implementation of LibSass version 3.6.2 for OS X (x64).

This package is only compatible with .NET Core.</description>
<releaseNotes>Added support of the LibSass version 3.6.2.</releaseNotes>
<releaseNotes>Fixed a error #31 “Unhandled exceptions”.</releaseNotes>
<copyright>Copyright © 2015-2019 Andrey Taritsyn</copyright>
<language>en-US</language>
<tags>LibSass Sass SCSS CSS macOS OSX x64</tags>
Expand Down
4 changes: 2 additions & 2 deletions src/LibSassHost.Native.osx-x64/readme.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


--------------------------------------------------------------------------------
README file for LibSass Host Native for OS X x64 v1.2.7
README file for LibSass Host Native for OS X x64 v1.2.8

--------------------------------------------------------------------------------

Expand All @@ -19,7 +19,7 @@
=============
RELEASE NOTES
=============
Added support of the LibSass version 3.6.2.
Fixed a error #31 “Unhandled exceptions”.

============
PROJECT SITE
Expand Down
4 changes: 2 additions & 2 deletions src/LibSassHost.Native.win-x64/LibSassHost.Native.win-x64.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>LibSassHost.Native.win-x64</id>
<version>1.2.7</version>
<version>1.2.8</version>
<title>LibSass Host Native for Windows (x64)</title>
<authors>Andrey Taritsyn</authors>
<owners>Andrey Taritsyn</owners>
Expand All @@ -12,7 +12,7 @@
<repository type="git" url="https://github.com/Taritsyn/LibSassHost" />
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package complements the LibSassHost package and contains the native implementation of LibSass version 3.6.2 for Windows (x64).</description>
<releaseNotes>Added support of the LibSass version 3.6.2.</releaseNotes>
<releaseNotes>Fixed a error #31 “Unhandled exceptions”.</releaseNotes>
<copyright>Copyright © 2015-2019 Andrey Taritsyn</copyright>
<language>en-US</language>
<tags>LibSass Sass SCSS CSS Windows x64</tags>
Expand Down
4 changes: 2 additions & 2 deletions src/LibSassHost.Native.win-x64/readme.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


--------------------------------------------------------------------------------
README file for LibSass Host Native for Windows x64 v1.2.7
README file for LibSass Host Native for Windows x64 v1.2.8

--------------------------------------------------------------------------------

Expand All @@ -17,7 +17,7 @@
=============
RELEASE NOTES
=============
Added support of the LibSass version 3.6.2.
Fixed a error #31 “Unhandled exceptions”.

============
PROJECT SITE
Expand Down
4 changes: 2 additions & 2 deletions src/LibSassHost.Native.win-x86/LibSassHost.Native.win-x86.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>LibSassHost.Native.win-x86</id>
<version>1.2.7</version>
<version>1.2.8</version>
<title>LibSass Host Native for Windows (x86)</title>
<authors>Andrey Taritsyn</authors>
<owners>Andrey Taritsyn</owners>
Expand All @@ -12,7 +12,7 @@
<repository type="git" url="https://github.com/Taritsyn/LibSassHost" />
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package complements the LibSassHost package and contains the native implementation of LibSass version 3.6.2 for Windows (x86).</description>
<releaseNotes>Added support of the LibSass version 3.6.2.</releaseNotes>
<releaseNotes>Fixed a error #31 “Unhandled exceptions”.</releaseNotes>
<copyright>Copyright © 2015-2019 Andrey Taritsyn</copyright>
<language>en-US</language>
<tags>LibSass Sass SCSS CSS Windows x86</tags>
Expand Down
4 changes: 2 additions & 2 deletions src/LibSassHost.Native.win-x86/readme.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


--------------------------------------------------------------------------------
README file for LibSass Host Native for Windows x86 v1.2.7
README file for LibSass Host Native for Windows x86 v1.2.8

--------------------------------------------------------------------------------

Expand All @@ -17,7 +17,7 @@
=============
RELEASE NOTES
=============
Added support of the LibSass version 3.6.2.
Fixed a error #31 “Unhandled exceptions”.

============
PROJECT SITE
Expand Down
2 changes: 1 addition & 1 deletion src/LibSassHost/LibSassHost.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ This package does not contain the native implementations of LibSass. Therefore,
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PackageTags>LibSass;Sass;SCSS;CSS</PackageTags>
<PackageReleaseNotes>An attempt was made to prevent occurrence of the access violation exception in the `PtrToString` method.</PackageReleaseNotes>
<PackageReleaseNotes>Fixed a error #31 “Unhandled exceptions”.</PackageReleaseNotes>
<NeutralLanguage>en-US</NeutralLanguage>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
Expand Down
3 changes: 1 addition & 2 deletions src/LibSassHost/readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
=============
RELEASE NOTES
=============
An attempt was made to prevent occurrence of the access violation exception in
the `PtrToString` method.
Fixed a error #31 “Unhandled exceptions”.

============
PROJECT SITE
Expand Down
4 changes: 3 additions & 1 deletion src/libsass/sass_context.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ namespace Sass {
c_ctx->error_file = sass_copy_c_string(e.pstate.path);
c_ctx->error_line = e.pstate.line + 1;
c_ctx->error_column = e.pstate.column + 1;
c_ctx->error_src = e.pstate.src;
c_ctx->error_src = sass_copy_string((char*)/*LSH+*/e.pstate.src)/*LSH+*/;
c_ctx->output_string = 0;
c_ctx->source_map_string = 0;
json_delete(json_err);
Expand Down Expand Up @@ -542,6 +542,7 @@ extern "C" {
if (ctx->error_text) free(ctx->error_text);
if (ctx->error_json) free(ctx->error_json);
if (ctx->error_file) free(ctx->error_file);
if (ctx->error_src) free((char*)ctx->error_src); //LSH+
free_string_array(ctx->included_files);
// play safe and reset properties
ctx->output_string = 0;
Expand All @@ -550,6 +551,7 @@ extern "C" {
ctx->error_text = 0;
ctx->error_json = 0;
ctx->error_file = 0;
ctx->error_src = 0; //LSH+
ctx->included_files = 0;
// debug leaked memory
#ifdef DEBUG_SHARED_PTR
Expand Down
8 changes: 4 additions & 4 deletions test/LibSassHost.Benchmarks/LibSassHost.Benchmarks.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.8" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.8" />

<ProjectReference Include="..\..\src\LibSassHost\LibSassHost.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.0' ">
<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.2.8" />
<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.2.8" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions test/LibSassHost.Test.Common/LibSassHost.Test.Common.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.8" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.8" />

<ProjectReference Include="..\..\src\LibSassHost\LibSassHost.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' Or '$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.0' ">
<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.2.7" />
<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.2.8" />
<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.2.8" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
Expand Down

0 comments on commit 7d5cf08

Please sign in to comment.