pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
0ad: partially revert patch
Module Name: pkgsrc-wip
Committed By: nikita <nikita%NetBSD.org@localhost>
Pushed By: nikita
Date: Wed May 3 23:52:23 2023 +0200
Changeset: b2db4e319553217d51ed6d0fc37d421ee2fb88fd
Modified Files:
0ad/distinfo
0ad/patches/patch-source_lib_secure__crt.cpp
Log Message:
0ad: partially revert patch
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b2db4e319553217d51ed6d0fc37d421ee2fb88fd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
0ad/distinfo | 2 +-
0ad/patches/patch-source_lib_secure__crt.cpp | 15 ---------------
2 files changed, 1 insertion(+), 16 deletions(-)
diffs:
diff --git a/0ad/distinfo b/0ad/distinfo
index eb906ddd26..9f86936763 100644
--- a/0ad/distinfo
+++ b/0ad/distinfo
@@ -15,7 +15,7 @@ SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_FUStringBuilder.hpp) =
SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_Platforms.h) = 6887cca8e6ff1765a6b666bd595f8bcb41c2a90f
SHA1 (patch-libraries_source_spidermonkey_build.sh) = 34225c82659cc236bff076301dd52adca9888f92
SHA1 (patch-source_lib_allocators_page__aligned.cpp) = c25054afd543a1a90530964a63b2b692b1687765
-SHA1 (patch-source_lib_secure__crt.cpp) = 6efefd2cca718ae55f65e078e19fa8f9770efedd
+SHA1 (patch-source_lib_secure__crt.cpp) = 1eaa9eb892d75e6a2533dc031675615138550e51
SHA1 (patch-source_network_StunClient.cpp) = 6267d44c3d0345d3e47c19746f105657ba984876
SHA1 (patch-source_scriptinterface_ScriptTypes.h) = f2351c637ba7ed7a36b4399b6e89a0d8281c9ad4
SHA1 (patch-source_third__party_mikktspace_weldmesh.cpp) = 35df7dd5d5d2aa784ef03599a47cc69982ebe332
diff --git a/0ad/patches/patch-source_lib_secure__crt.cpp b/0ad/patches/patch-source_lib_secure__crt.cpp
index 2cb3f14381..719515a5e3 100644
--- a/0ad/patches/patch-source_lib_secure__crt.cpp
+++ b/0ad/patches/patch-source_lib_secure__crt.cpp
@@ -11,18 +11,3 @@ $NetBSD$
// return length [in characters] of a string, not including the trailing
// null character. to protect against access violations, only the
// first <max_len> characters are examined; if the null character is
-@@ -126,10 +126,13 @@
- WARN_IF_PTR_LEN(max_len);
-
- size_t len;
-+#if defined(__NetBSD__)
-+ len = wcsnlen(str, max_len);
-+#else
- for(len = 0; len < max_len; len++)
- if(*str++ == '\0')
- break;
--
-+#endif
- return len;
- }
- #endif // !OS_UNIX
Home |
Main Index |
Thread Index |
Old Index