Merge branch 'master' into apple-silicon

G-Research · Oct 15, 2023 · 90bdbe1 · 90bdbe1
2 parents 904f6c6 + 7e22bef
commit 90bdbe1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/cpp/ExceptionInfo.h b/cpp/ExceptionInfo.h
@@ -20,6 +20,10 @@ struct ExceptionInfo final
 		expression															\
 		return nullptr;														\
 	}																		\
+	catch (const std::bad_alloc& exception)									\
+	{																		\
+		return new ExceptionInfo("OutOfMemoryException", exception.what()); \
+	}																		\
 	catch (const std::exception& exception)									\
 	{																		\
 		return new ExceptionInfo(exception);								\

diff --git a/csharp/ExceptionInfo.cs b/csharp/ExceptionInfo.cs
@@ -28,7 +28,14 @@ public static void Check(IntPtr exceptionInfo)
 
             ExceptionInfo_Free(exceptionInfo);
 
-            throw new ParquetException(type, message);
+            if (type == "OutOfMemoryException")
+            {
+                throw new OutOfMemoryException(message);
+            }
+            else
+            {
+                throw new ParquetException(type, message);
+            }
         }
 
         public static TValue Return<TValue>(GetAction<TValue> getter)