Date: Tue, 20 Jan 2015 21:47:16 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377542 - in head/japanese/ebview-gtk2: . files Message-ID: <201501202147.t0KLlGeT051144@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Jan 20 21:47:15 2015 New Revision: 377542 URL: https://svnweb.freebsd.org/changeset/ports/377542 QAT: https://qat.redports.org/buildarchive/r377542/ Log: japanese/ebview-gtk2: Fix size mismatch between int and ssize_t (amd64) This fetchs the source of segfaults on amd64. PR: 196184 Submitted by: moga (chigusa.homeunix.org) Added: head/japanese/ebview-gtk2/files/patch-src_eb.c (contents, props changed) Modified: head/japanese/ebview-gtk2/Makefile Modified: head/japanese/ebview-gtk2/Makefile ============================================================================== --- head/japanese/ebview-gtk2/Makefile Tue Jan 20 21:29:52 2015 (r377541) +++ head/japanese/ebview-gtk2/Makefile Tue Jan 20 21:47:15 2015 (r377542) @@ -2,7 +2,7 @@ PORTNAME= ebview PORTVERSION= 0.3.6 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= japanese MASTER_SITES= SF PKGNAMESUFFIX= -gtk2 Added: head/japanese/ebview-gtk2/files/patch-src_eb.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/ebview-gtk2/files/patch-src_eb.c Tue Jan 20 21:47:15 2015 (r377542) @@ -0,0 +1,68 @@ +--- src/eb.c.orig 2014-12-22 16:50:58.000000000 +0900 ++++ src/eb.c 2014-12-22 16:54:43.000000000 +0900 +@@ -674,7 +674,8 @@ + EB_Error_Code error_code=EB_SUCCESS; + EB_Position text_position; + char data[EB_SIZE_PAGE+4]; +- int i, length; ++ int i; ++ ssize_t length; + + int start_page; + int end_page; +@@ -856,7 +857,8 @@ + char data[EB_SIZE_PAGE]; + char *jisword; + char *word_p; +- int i, length; ++ int i; ++ ssize_t length; + char *p; + char heading[MAXLEN_TEXT + 1]; + RESULT *rp; +@@ -1053,7 +1055,7 @@ + char data[EB_SIZE_PAGE]; + char *jisword; + char *word_p; +- int length; ++ ssize_t length; + char *p; + char heading[MAXLEN_TEXT + 1]; + RESULT *rp; +@@ -1679,7 +1681,8 @@ + gint ebook_simple_search2(BOOK_INFO *binfo, char *word, gint method, gchar *title) + { + EB_Error_Code error_code=EB_SUCCESS; +- int i, len, total_hits=0; ++ int i, total_hits=0; ++ ssize_t len; + EB_Hit hits[MAX_HITS]; + int hitcount; + char heading[MAXLEN_HEADING + 1]; +@@ -1988,7 +1991,7 @@ + gchar *ebook_get_heading(BOOK_INFO *binfo, int page, int offset) + { + EB_Error_Code error_code; +- int len; ++ ssize_t len; + char heading[MAXLEN_HEADING + 1]; + EB_Position position; + gchar *p; +@@ -2021,7 +2024,7 @@ + + gchar *ebook_get_text(BOOK_INFO *binfo, int page, int offset){ + EB_Error_Code error_code; +- int len; ++ ssize_t len; + char text[MAXLEN_TEXT + 1]; + EB_Position position; + gchar *p; +@@ -2064,7 +2067,7 @@ + gchar *ebook_get_candidate(BOOK_INFO *binfo, int page, int offset) + { + EB_Error_Code error_code; +- int len; ++ ssize_t len; + char text[MAXLEN_TEXT + 1]; + EB_Position position; + gchar *p;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501202147.t0KLlGeT051144>