Skip to content

Conversation

@kazu-yamamoto
Copy link
Collaborator

@nh2 This should fix #584

let pathC = map castCharToCChar path
when (length pathC >= unixPathMax) $ error
$ "pokeSockAddr: path is too long in SockAddrUnix " <> show path
<> ", length " <> show (length path) <> ", unixPathMax " <> show unixPathMax
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be good to change the error message to show (length pathC); currently it's equivalent since done with map, but maybe in the future we lift the constraint in the future that the path must not contain unicode chars (which is a pretty weird contraint because it should prevent anybody who uses non-ASCII chars in their home directory to place sockets there).

Otherwise, looks good!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. Please check it again.

@kazu-yamamoto kazu-yamamoto merged commit 8d9e69b into haskell:master Aug 27, 2024
@kazu-yamamoto kazu-yamamoto deleted the sockaddr-unix-length-check branch August 27, 2024 07:32
@kazu-yamamoto
Copy link
Collaborator Author

Merging without the second review.

netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Jan 30, 2025
## Version 3.2.7.0

* Using nested `bracket` for `gracefulClose`.
  [#591](haskell/network#590)
* Fix memory leak in getaddrinfo and make it async exception safe.
  [#591](haskell/network#591)
* Make call to c_free async exception safe.
  [#592](haskell/network#592)

## Version 3.2.6.0

* fixing the Show instance of IPv4-mapped IPv6 address on little endian machines

## Version 3.2.5.0

* `gracefulClose` based on STM racing and `timeout`.
  [#587](haskell/network#587)

## Version 3.2.4.0

* New API: setSockOptValue.
  [#588](haskell/network#588)

## Version 3.2.3.0

* Making getAddrInfo polymorphic
  [#587](haskell/network#587)

## Version 3.2.2.0

* New API: waitReadSocketSTM, waitAndCancelReadSocketSTM,
  waitWriteSocketSTM, waitAndCancelWriteSocketSTM
  [#586](haskell/network#586)
* Checking the length of ASCII string allowing trailing 0.
  [#585](haskell/network#585)

## Version 3.2.1.0

* Trying to release with the latest autoreconf.
  Packing "network" in the local directory instead of CI.
* Remove includes from .cabal-file
  [#583](haskell/network#583)
* making gracefulClose more graceful
  [#580](haskell/network#580)
* Update config.guess, config.sub to their latest versions
  [#579](haskell/network#579)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

pokeSockAddr check ignores multi-char Unicode bytes and forgets about NULL terminator

2 participants