[Forensics-changes] [yara] 329/368: Merge branch 'master' of https://github.com/VirusTotal/yara
Hilko Bengen
bengen at moszumanska.debian.org
Sat Jul 1 10:30:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag v3.5.0
in repository yara.
commit 30cc8e121d5463466c25375478deba25207bb4c0
Merge: e085a86 b8d6e87
Author: plusvic <plusvic at gmail.com>
Date: Thu Jun 16 14:58:24 2016 +0200
Merge branch 'master' of https://github.com/VirusTotal/yara
libyara/include/yara/sizedstr.h | 11 +++++++++--
tests/test-alignment.c | 4 ++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --cc libyara/include/yara/sizedstr.h
index c6e8732,3f5effa..b4182f8
--- a/libyara/include/yara/sizedstr.h
+++ b/libyara/include/yara/sizedstr.h
@@@ -28,14 -29,14 +29,20 @@@ limitations under the License
#define SIZED_STRING_FLAGS_NO_CASE 1
#define SIZED_STRING_FLAGS_DOT_ALL 2
++#pragma pack(push)
++#pragma pack(8)
++
++
typedef struct _SIZED_STRING
{
- size_t length;
- int flags;
+ uint64_t length;
+ uint32_t flags;
char c_string[1];
} SIZED_STRING;
++#pragma pack(pop)
++
int sized_string_cmp(
SIZED_STRING* s1,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git
More information about the forensics-changes
mailing list