Uh oh!
There was an error while loading. Please reload this page.
OLEDB: Fix for AV Exception on x86 architecture#32150
Uh oh!
There was an error while loading. Please reload this page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -4,13 +4,16 @@ | ||
| using System.Data.Common; | ||
| using System.Diagnostics; | ||
| using System.Runtime.InteropServices; | ||
| using System.Text; | ||
| namespace System.Data.OleDb | ||
| { | ||
| internal sealed class Bindings | ||
| { | ||
| private static readonly bool s_runningOnX86 = RuntimeInformation.ProcessArchitecture == Architecture.X86; | ||
| private readonly tagDBPARAMBINDINFO[] _bindInfo; | ||
| private readonly tagDBPARAMBINDINFO_x86[] _bindInfo_x86; | ||
| private readonly tagDBBINDING[] _dbbindings; | ||
| private readonly tagDBCOLUMNACCESS[] _dbcolumns; | ||
| @@ -42,7 +45,10 @@ private Bindings(int count) | ||
| internal Bindings(OleDbParameter[] parameters, int collectionChangeID) : this(parameters.Length) | ||
| { | ||
| if (s_runningOnX86) | ||
| _bindInfo_x86 = new tagDBPARAMBINDINFO_x86[parameters.Length]; | ||
| else | ||
| _bindInfo = new tagDBPARAMBINDINFO[parameters.Length]; | ||
| _parameters = parameters; | ||
| _collectionChangeID = collectionChangeID; | ||
| _ifIRowsetElseIRow = true; | ||
| @@ -54,6 +60,11 @@ internal Bindings(OleDbDataReader dataReader, bool ifIRowsetElseIRow, int count) | ||
| _ifIRowsetElseIRow = ifIRowsetElseIRow; | ||
| } | ||
| internal tagDBPARAMBINDINFO_x86[] BindInfo_x86 | ||
| { | ||
| get { return _bindInfo_x86; } | ||
| } | ||
| internal tagDBPARAMBINDINFO[] BindInfo | ||
| { | ||
| get { return _bindInfo; } | ||
| @@ -100,41 +111,61 @@ internal bool ForceRebind | ||
| // tagDBPARAMBINDINFO member access | ||
| internal IntPtr DataSourceType | ||
| { | ||
| set | ||
| { | ||
| if (s_runningOnX86) | ||
| _bindInfo_x86[_index].pwszDataSourceType = value; | ||
| else | ||
| _bindInfo[_index].pwszDataSourceType = value; | ||
| } | ||
| } | ||
| internal IntPtr Name | ||
| { | ||
| set | ||
| { | ||
| if (s_runningOnX86) | ||
Contributor There was a problem hiding this comment. Ternary expression might be neater for these (?) | ||
| _bindInfo_x86[_index].pwszName = value; | ||
| else | ||
| _bindInfo[_index].pwszName = value; | ||
| } | ||
| } | ||
| internal IntPtr ParamSize | ||
| { | ||
| get | ||
| { | ||
| if (s_runningOnX86) | ||
| { | ||
| if (null != _bindInfo_x86) | ||
| { | ||
| return _bindInfo_x86[_index].ulParamSize; | ||
| } | ||
| return IntPtr.Zero; | ||
maryamariyan marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| } | ||
| else | ||
| { | ||
| if (null != _bindInfo) | ||
| { | ||
| return _bindInfo[_index].ulParamSize; | ||
| } | ||
| return IntPtr.Zero; | ||
| } | ||
| } | ||
| set | ||
| { | ||
| if (s_runningOnX86) | ||
| _bindInfo_x86[_index].ulParamSize = value; | ||
| else | ||
| _bindInfo[_index].ulParamSize = value; | ||
| } | ||
| } | ||
| internal int Flags | ||
| { | ||
| set | ||
| { | ||
| if (s_runningOnX86) | ||
| _bindInfo_x86[_index].dwFlags = value; | ||
| else | ||
| _bindInfo[_index].dwFlags = value; | ||
| } | ||
| } | ||
| @@ -223,9 +254,19 @@ internal byte Precision | ||
| #endif | ||
| set | ||
| { | ||
| if (s_runningOnX86) | ||
| { | ||
| if (null != _bindInfo_x86) | ||
| { | ||
| _bindInfo_x86[_index].bPrecision = value; | ||
| } | ||
| } | ||
| else | ||
| { | ||
| if (null != _bindInfo) | ||
| { | ||
| _bindInfo[_index].bPrecision = value; | ||
| } | ||
| } | ||
| _dbbindings[_index].bPrecision = value; | ||
| _dbcolumns[_index].bPrecision = value; | ||
| @@ -238,9 +279,19 @@ internal byte Scale | ||
| #endif | ||
| set | ||
| { | ||
| if (s_runningOnX86) | ||
| { | ||
| if (null != _bindInfo_x86) | ||
| { | ||
| _bindInfo_x86[_index].bScale = value; | ||
| } | ||
| } | ||
| else | ||
| { | ||
| if (null != _bindInfo) | ||
| { | ||
| _bindInfo[_index].bScale = value; | ||
| } | ||
| } | ||
| _dbbindings[_index].bScale = value; | ||
| _dbcolumns[_index].bScale = value; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -400,7 +400,14 @@ private void CreateAccessor() | ||
| bindings.AllocateForAccessor(null, 0, 0); | ||
| if (bindings.BindInfo_x86 != null) | ||
| { | ||
| ApplyParameterBindings(commandWithParameters, bindings.BindInfo_x86); | ||
Member There was a problem hiding this comment. You can make the | ||
| } | ||
| else | ||
| { | ||
| ApplyParameterBindings(commandWithParameters, bindings.BindInfo); | ||
| } | ||
| UnsafeNativeMethods.IAccessor iaccessor = IAccessor(); | ||
| OleDbHResult hr = bindings.CreateAccessor(iaccessor, ODB.DBACCESSOR_PARAMETERDATA); | ||
| @@ -411,14 +418,37 @@ private void CreateAccessor() | ||
| _dbBindings = bindings; | ||
| } | ||
| private unsafe void ApplyParameterBindings(UnsafeNativeMethods.ICommandWithParameters commandWithParameters, tagDBPARAMBINDINFO[] bindInfo) | ||
| { | ||
| IntPtr[] ordinals = new IntPtr[bindInfo.Length]; | ||
| for (int i = 0; i < ordinals.Length; ++i) | ||
| { | ||
| ordinals[i] = (IntPtr)(i + 1); | ||
| } | ||
| OleDbHResult hr; | ||
| fixed (tagDBPARAMBINDINFO* p = &bindInfo[0]) | ||
Contributor There was a problem hiding this comment. @jkotas Would it be better to take the bindInfo here and check if we are running on x86 platform, and if we are, then create an array of privateunsafevoidApplyParameterBindings(UnsafeNativeMethods.ICommandWithParameterscommandWithParameters,tagDBPARAMBINDINFO[]bindInfo){IntPtr[]ordinals=newIntPtr[bindInfo.Length];for(inti=0;i<ordinals.Length;++i){ordinals[i]=(IntPtr)(i+1);}OleDbHResulthr;if(s_runningOnX86){tagDBPARAMBINDINFO_x86[]bindInfo_x86=newtagDBPARAMBINDINFO_x86[bindInfo.Length];for(inti=0;i<bindInfo.Length;i++){
fixed (tagDBPARAMBINDINFO*p=&bindInfo[i]){bindInfo_x86[i]=(tagDBPARAMBINDINFO_x86)Marshal.PtrToStructure((IntPtr)p,typeof(tagDBPARAMBINDINFO_x86));}}
fixed (tagDBPARAMBINDINFO_x86*p=&bindInfo_x86[0]){hr=commandWithParameters.SetParameterInfo((IntPtr)bindInfo.Length,ordinals,(IntPtr)p);}}else{
fixed (tagDBPARAMBINDINFO*p=&bindInfo[0]){hr=commandWithParameters.SetParameterInfo((IntPtr)bindInfo.Length,ordinals,(IntPtr)p);}}if(hr<0){ProcessResults(hr);}}And ofcourse we change the signature of SetParameterInfo to System.Data.OleDb.OleDbHResultSetParameterInfo([In]IntPtrcParams,[In,MarshalAs(UnmanagedType.LPArray)]IntPtr[]rgParamOrdinals,[In]IntPtrrgParamBindInfo);as @maryamariyan has already done? There would be data duplication and manipulation for x86 scenario, but it does simplify the code greatly. Member There was a problem hiding this comment.
Yes, that would be an option as well, especially given that this fix will need replicated in many more places. As you have said, it will result into extra data copies on x86, and the code will take very different path on x86 in general. We need to make sure to test it well. | ||
| { | ||
| hr = commandWithParameters.SetParameterInfo((IntPtr)bindInfo.Length, ordinals, (IntPtr)p); | ||
| } | ||
| if (hr < 0) | ||
| { | ||
| ProcessResults(hr); | ||
| } | ||
| } | ||
| private unsafe void ApplyParameterBindings(UnsafeNativeMethods.ICommandWithParameters commandWithParameters, tagDBPARAMBINDINFO_x86[] bindInfo_x86) | ||
| { | ||
| IntPtr[] ordinals = new IntPtr[bindInfo_x86.Length]; | ||
| for (int i = 0; i < ordinals.Length; ++i) | ||
| { | ||
| ordinals[i] = (IntPtr)(i + 1); | ||
| } | ||
| OleDbHResult hr; | ||
| fixed (tagDBPARAMBINDINFO_x86* p = &bindInfo_x86[0]) | ||
| { | ||
| hr = commandWithParameters.SetParameterInfo((IntPtr)bindInfo_x86.Length, ordinals, (IntPtr)p); | ||
| } | ||
| if (hr < 0) | ||
| { | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The old defines referenced "ARCH_arm". (I assume that referred to 32 bit.) Do we expect this library to work on ARM/ARM64? If so will the right things happen?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, the right things will happen for ARM/ARM64. This is the condition that we are replicating from
oledb.hfrom Windows SDK: