Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-3]: src/dist/file/src Pull up revision 1.8 (requested by christos...



details:   https://anonhg.NetBSD.org/src/rev/6c987c90122e
branches:  netbsd-3
changeset: 575985:6c987c90122e
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Jun 02 20:41:30 2005 +0000

description:
Pull up revision 1.8 (requested by christos in ticket #386):
PR/29682: sigsegv: /usr/bin/file does not seem to understand some fields
of an ELF binary. Someone ate my !

diffstat:

 dist/file/src/apprentice.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 768a35aba9ae -r 6c987c90122e dist/file/src/apprentice.c
--- a/dist/file/src/apprentice.c        Wed Jun 01 17:26:28 2005 +0000
+++ b/dist/file/src/apprentice.c        Thu Jun 02 20:41:30 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: apprentice.c,v 1.7 2005/02/21 15:00:05 pooka Exp $     */
+/*     $NetBSD: apprentice.c,v 1.7.2.1 2005/06/02 20:41:30 tron Exp $  */
 
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
@@ -50,7 +50,7 @@
 #if 0
 FILE_RCSID("@(#)Id: apprentice.c,v 1.82 2004/11/24 18:56:04 christos Exp")
 #else
-__RCSID("$NetBSD: apprentice.c,v 1.7 2005/02/21 15:00:05 pooka Exp $");
+__RCSID("$NetBSD: apprentice.c,v 1.7.2.1 2005/06/02 20:41:30 tron Exp $");
 #endif
 #endif /* lint */
 
@@ -1231,7 +1231,7 @@
        m->cont_level = swap2(m->cont_level);
        m->offset = swap4((uint32_t)m->offset);
        m->in_offset = swap4((uint32_t)m->in_offset);
-       if (IS_STRING(m->type))
+       if (!IS_STRING(m->type))
                m->value.l = swap4(m->value.l);
        m->mask = swap4(m->mask);
 }



Home | Main Index | Thread Index | Old Index