home  bbs  files  messages ]

      ZZLI4427             linux.debian.maint.boot             505 messages      

[ previous | next | reply ]

[ list messages | list forums ]

  Msg # 23 of 505 on ZZLI4427, Thursday 8-20-25, 12:37  
  From: SIMON MCVITTIE  
  To: ALL  
  Subj: Bug#1111600: bookworm-pu: package glib2.  
 [continued from previous message] 
  
 diff -Nru glib2.0-2.74.6/glib/gstring.c glib2.0-2.74.6/glib/gstring.c 
 --- glib2.0-2.74.6/glib/gstring.c 2023-02-23 13:54:27.000000000 +0000 
 +++ glib2.0-2.74.6/glib/gstring.c 2025-08-18 10:52:22.000000000 +0100 
 @@ -426,8 +426,9 @@ 
      return string; 
  
    if (len < 0) 
 -    len = strlen (val); 
 -  len_unsigned = len; 
 +    len_unsigned = strlen (val); 
 +  else 
 +    len_unsigned = len; 
  
    if (pos < 0) 
      pos_unsigned = string->len; 
 @@ -725,10 +726,12 @@ 
    g_string_maybe_expand (string, 1); 
  
    if (pos < 0) 
 -    pos = string->len; 
 +    pos_unsigned = string->len; 
    else 
 -    g_return_val_if_fail ((gsize) pos <= string->len, string); 
 -  pos_unsigned = pos; 
 +    { 
 +      pos_unsigned = pos; 
 +      g_return_val_if_fail (pos_unsigned <= string->len, string); 
 +    } 
  
    /* If not just an append, move the old stuff */ 
    if (pos_unsigned < string->len) 
 @@ -761,6 +764,7 @@ 
                           gssize    pos, 
                           gunichar  wc) 
  { 
 +  gsize pos_unsigned; 
    gint charlen, first, i; 
    gchar *dest; 
  
 @@ -802,15 +806,18 @@ 
    g_string_maybe_expand (string, charlen); 
  
    if (pos < 0) 
 -    pos = string->len; 
 +    pos_unsigned = string->len; 
    else 
 -    g_return_val_if_fail ((gsize) pos <= string->len, string); 
 +    { 
 +      pos_unsigned = pos; 
 +      g_return_val_if_fail (pos_unsigned <= string->len, string); 
 +    } 
  
    /* If not just an append, move the old stuff */ 
 -  if ((gsize) pos < string->len) 
 -    memmove (string->str + pos + charlen, string->str + pos, string->len - 
 pos); 
 +  if (pos_unsigned < string->len) 
 +    memmove (string->str + pos_unsigned + charlen, string->str + 
 pos_unsigned, string->len - pos_unsigned); 
  
 -  dest = string->str + pos; 
 +  dest = string->str + pos_unsigned; 
    /* Code copied from g_unichar_to_utf() */ 
    for (i = charlen - 1; i > 0; --i) 
      { 
 @@ -868,6 +875,7 @@ 
                          const gchar *val, 
                          gssize       len) 
  { 
 +  gsize len_unsigned; 
    gsize end; 
  
    g_return_val_if_fail (string != NULL, NULL); 
 @@ -879,14 +887,16 @@ 
    g_return_val_if_fail (pos <= string->len, string); 
  
    if (len < 0) 
 -    len = strlen (val); 
 +    len_unsigned = strlen (val); 
 +  else 
 +    len_unsigned = len; 
  
 -  end = pos + len; 
 +  end = pos + len_unsigned; 
  
    if (end > string->len) 
      g_string_maybe_expand (string, end - string->len); 
  
 -  memcpy (string->str + pos, val, len); 
 +  memcpy (string->str + pos, val, len_unsigned); 
  
    if (end > string->len) 
      { 
  
 --- SoupGate-Win32 v1.05 
  * Origin: you cannot sedate... all the things you hate (1:229/2) 

[ list messages | list forums | previous | next | reply ]

search for:

328,100 visits
(c) 1994,  bbs@darkrealms.ca