Merge pull request #480 from samueltardieu/invalid-reference-casting

burrbull · web-flow · commit 2c10000cc643 · 2024-01-30T20:06:31.000Z
Replace UB code by a legitimate pointer access
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Move from bors/manual merge to GH merge queue
 - Add tools/check.py python script for local check
 - Add changelog check on PRs
+- Replace UB code by a legitimate pointer access
 
 ## [v0.10.0] - 2022-12-12
 
diff --git a/src/spi.rs b/src/spi.rs
@@ -355,7 +355,7 @@ where
 
     fn write_data_reg(&mut self, data: FrameSize) {
         // NOTE(write_volatile) see note above
-        unsafe { ptr::write_volatile(&self.spi.dr as *const _ as *mut FrameSize, data) }
+        unsafe { ptr::write_volatile(ptr::addr_of!(self.spi.dr) as *mut FrameSize, data) }
     }
 
     // Implement write as per the "Transmit only procedure" page 712

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ where`
`355`	`355`
`356`	`356`	`fn write_data_reg(&mut self, data: FrameSize) {`
`357`	`357`	`// NOTE(write_volatile) see note above`
`358`		`- unsafe { ptr::write_volatile(&self.spi.dr as const _ as mut FrameSize, data) }`
	`358`	`+ unsafe { ptr::write_volatile(ptr::addr_of!(self.spi.dr) as *mut FrameSize, data) }`
`359`	`359`	`}`
`360`	`360`
`361`	`361`	`// Implement write as per the "Transmit only procedure" page 712`